diff --git a/Game/gfx/bBlank.png b/Game/gfx/bBlank.png new file mode 100644 index 0000000..16803bf Binary files /dev/null and b/Game/gfx/bBlank.png differ diff --git a/source/AUTH b/source/AUTH index 1ba9aa1..dc032b2 100644 --- a/source/AUTH +++ b/source/AUTH @@ -15,6 +15,7 @@ PenguinAttack.ttf Dustin Norlander - GPLv2 14P_Arial_Angle_Red.png Karl Bartel - http://user.cs.tu-berlin.de/~karlb/sfont/fonts.html b1024.png Poul Sander bBack.png Poul Sander +bBlank.png Poul Sander bChange.png Poul Sander bConnect.png qubodup bConfigure.png qubodup diff --git a/source/code/BlockGame.cpp b/source/code/BlockGame.cpp index f649aca..b654c7f 100644 --- a/source/code/BlockGame.cpp +++ b/source/code/BlockGame.cpp @@ -2092,6 +2092,8 @@ void BlockGame::UpdateInternal(int newtick) void BlockGame::Update(int newtick) { + if(bNetworkPlayer) + return; if(bReplaying) { /*cout << "Testing " << replayIndex << "<" << theReplay.getActions().size() diff --git a/source/code/NetworkThing.hpp b/source/code/NetworkThing.hpp index 473bd3c..ab75416 100644 --- a/source/code/NetworkThing.hpp +++ b/source/code/NetworkThing.hpp @@ -221,6 +221,8 @@ public: string param; while(bgHome->GotAction(tick,action,param)) { + if(action == ACTION_NEW || action == ACTION_NEWTT || action == ACTION_NEWVS) + continue; //Do not send start messages paramsize = param.length(); char *tmpPacket = (char*)malloc(sizeof(Sint32)*3+param.length()+1); if(!tmpPacket) { @@ -297,6 +299,8 @@ public: ENetPacket * answerPacket = enet_packet_create("version4",sizeof("version4"),ENET_PACKET_FLAG_RELIABLE); enet_host_broadcast (server, 3, answerPacket); theSeed = time(0)/4; + bgHome->NewVsGame(50,100,bgAway,SDL_GetTicks()); + bgAway->NewVsGame(xsize-500,100,bgHome,SDL_GetTicks()); bgHome->putStartBlocks(theSeed); ENetPacket * timePacket = enet_packet_create(&theSeed,sizeof(theSeed),ENET_PACKET_FLAG_RELIABLE); enet_host_broadcast (server, 3, timePacket); diff --git a/source/code/main.cpp b/source/code/main.cpp index 66dab4d..a3458a1 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp @@ -521,9 +521,9 @@ static int InitImages() //end new in 1.3.2 //new in 1.4.0 && (bTheme = IMG_Load2((char*)"gfx/bTheme.png")) - && (bSkip = IMG_Load2((char*)"gfx/bSkip.png")) - && (bNext = IMG_Load2((char*)"gfx/bNext.png")) - && (bRetry = IMG_Load2((char*)"gfx/bRetry.png")) + && (bSkip = IMG_Load2((char*)"gfx/bBlank.png")) + && (bNext = IMG_Load2((char*)"gfx/bBlank.png")) + && (bRetry = IMG_Load2((char*)"gfx/bBlank.png")) )) //if there was a problem ie. "File not found" { @@ -671,6 +671,13 @@ static int InitImages() nf_scoreboard_font.draw(370,197,_("Time:") ); nf_scoreboard_font.draw(370,246,_("Chain:") ); nf_scoreboard_font.draw(370,295,_("Speed:") ); + nf_button_font.setDest(bRetry); + nf_button_font.drawCenter(60,10,_("Retry")); + nf_button_font.setDest(bNext); + nf_button_font.drawCenter(60,10,_("Next")); + nf_button_font.setDest(bSkip); + nf_button_font.drawCenter(60,10,_("Skip")); + nf_button_font.setDest(screen); //Loads the sound if sound present