commit e03ae476

sago007 · 2009-03-06 22:49
e03ae476cd05b129aaed342b9cb99d8a34510a9f patch · browse files
parent 2de0b212acbdb5c37ddac6dc860b1bbb5ae98794

New replay version, much more stable and fixed a problem with garbageML


git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@68 9d7177f8-192b-0410-8f35-a16a89829b06

Changed files

M	source/code/BlockGame.hpp before
M	source/code/main.cpp before
M	source/code/replay.cpp before

diff --git a/source/code/BlockGame.hpp b/source/code/BlockGame.hpp index 6ec85a9..2852ecf 100644 --- a/source/code/BlockGame.hpp +++ b/source/code/BlockGame.hpp

@@ -579,7 +579,8 @@ public:

chain=bp.chain;

speedLevel=bp.speed;

Uint8 result = bp.result;

- if (result%2==1) {

+ bGameOver = false; //Make sure that it is initialized!

+ if(result%2==1) {

bGameOver=true;

result-=1;

}

@@ -1194,6 +1195,10 @@ public:

TimeHandler::addTime("playTime",TimeHandler::ms2ct(gameEndedAfter));

}

+ if(bReplaying)

+ {

+ bReplaying = false;

+ }

theReplay.setFinalFrame(getPackage(), 0);

bGameOver = true;

showGame = false;

@@ -1975,7 +1980,7 @@ public:

if (board[j][i]%30==9)

DrawIMG(garbageML, sBoard, j*bsize, 12*bsize-i*bsize-pixels); //good

if (board[j][i]%30==10)

- DrawIMG(garbageMR, sBoard, j*bsize, bsize-i*bsize-pixels); //good

+ DrawIMG(garbageMR, sBoard, j*bsize, 12*bsize-i*bsize-pixels); //good

if (board[j][i]%30==11)

DrawIMG(garbageTR, sBoard, j*bsize, 12*bsize-i*bsize-pixels); //good

if (board[j][i]%30==12)

diff --git a/source/code/main.cpp b/source/code/main.cpp index c15ae55..cd4d8fc 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -4584,19 +4584,23 @@ int main(int argc, char *argv[])

Uint8 version = 0;

replayFileIn.read(reinterpret_cast<char*>(&version),sizeof(Uint8)); replayFileIn.close();

Replay r1;

- r1.loadReplay(loadThis);

- Replay r2;

- play2 = r2.loadReplay2(loadThis);

- theGame.playReplay(50,100); //Fejlen sker her

- theGame.theReplay = r1;

- if (play2)

+ if(r1.loadReplay(loadThis))

{

- theGame2.playReplay(xsize-500,100);

- theGame2.theReplay = r2;

+ Replay r2;

+ play2 = r2.loadReplay2(loadThis);

+ theGame.playReplay(50,100); //Fejlen sker her

+ theGame.theReplay = r1;

+ if (play2)

+ {

+ theGame2.playReplay(xsize-500,100);

+ theGame2.theReplay = r2;

+ }

+ else

+ theGame2.SetGameOver();

+ cout << "Replay should have been read" << endl;

}

else

- theGame2.SetGameOver();

- cout << "Replay should have been read" << endl;

+ cout << "Failed to read replay" << endl;

}

closeAllMenus();

diff --git a/source/code/replay.cpp b/source/code/replay.cpp index 9093150..30b3cb3 100644 --- a/source/code/replay.cpp +++ b/source/code/replay.cpp

@@ -114,13 +114,13 @@ int Replay::getFinalStatus()

bool Replay::saveReplay(string filename)

{

- //Saving as fileversion 2

- cout << "Saving as version 2 save file" << endl;

+ //Saving as fileversion 3

+ cout << "Saving as version 3 save file" << endl;

ofstream saveFile;

saveFile.open(filename.c_str(),ios::binary|ios::trunc);

if (saveFile)

{

- Uint32 version = 2;

+ Uint32 version = 3;

boardPackage bp;

saveFile.write(reinterpret_cast<char*>(&version),sizeof(Uint32)); //Fileversion

Uint8 nrOfReplays = 1;

@@ -129,18 +129,7 @@ bool Replay::saveReplay(string filename)

for (int i=0; i<nrOfFrames && i<bps.size();i++)

{ //Writing frames

bp = bps.at(i);

- saveFile.write(reinterpret_cast<char*>(&bp.time),sizeof(Uint32));

- for (int k=0;k<6;k++)

- for (int g=0;g<13;g++)

- {

- saveFile.write(reinterpret_cast<char*>(&bp.brick[k][g]),sizeof(Uint8));

- }

- saveFile.write(reinterpret_cast<char*>(&bp.pixels),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.cursorX),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.cursorY),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.score),sizeof(Uint32));

- saveFile.write(reinterpret_cast<char*>(&bp.speed),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.chain),sizeof(Uint8));

+ saveFile.write(reinterpret_cast<char*>(&bp),sizeof(bp));

}

saveFile.write(reinterpret_cast<char*>(&finalPack),sizeof(finalPack));

@@ -155,13 +144,13 @@ bool Replay::saveReplay(string filename)

bool Replay::saveReplay(string filename,Replay p2)

{

- //Saving as fileversion 2

- cout << "Saving as version 2 save file (2 players)" << endl;

+ //Saving as fileversion 3

+ cout << "Saving as version 3 save file (2 players)" << endl;

ofstream saveFile;

saveFile.open(filename.c_str(),ios::binary|ios::trunc);

if (saveFile)

{

- Uint32 version = 2;

+ Uint32 version = 3;

boardPackage bp;

saveFile.write(reinterpret_cast<char*>(&version),sizeof(Uint32)); //Fileversion

Uint8 nrOfReplays = 2;

@@ -170,16 +159,7 @@ bool Replay::saveReplay(string filename,Replay p2)

for (int i=0; i<nrOfFrames && i<bps.size();i++)

{ //Writing frames

bp = bps.at(i);

- saveFile.write(reinterpret_cast<char*>(&bp.time),sizeof(Uint32));

- for (int k=0;k<6;k++)

- for (int g=0;g<13;g++)

- saveFile.write(reinterpret_cast<char*>(&bp.brick[k][g]),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.pixels),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.cursorX),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.cursorY),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.score),sizeof(Uint32));

- saveFile.write(reinterpret_cast<char*>(&bp.speed),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.chain),sizeof(Uint8));

+ saveFile.write(reinterpret_cast<char*>(&bp),sizeof(bp));

}

saveFile.write(reinterpret_cast<char*>(&finalPack),sizeof(finalPack));

///Player 2 starts here!!!!!!!!!!!!!!!!!!!!!!

@@ -187,16 +167,7 @@ bool Replay::saveReplay(string filename,Replay p2)

for (int i=0; (i<p2.nrOfFrames)&& i<p2.bps.size();i++)

{ //Writing frames

bp = p2.bps.at(i);

- saveFile.write(reinterpret_cast<char*>(&bp.time),sizeof(Uint32));

- for (int k=0;k<6;k++)

- for (int g=0;g<13;g++)

- saveFile.write(reinterpret_cast<char*>(&bp.brick[k][g]),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.pixels),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.cursorX),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.cursorY),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.score),sizeof(Uint32));

- saveFile.write(reinterpret_cast<char*>(&bp.speed),sizeof(Uint8));

- saveFile.write(reinterpret_cast<char*>(&bp.chain),sizeof(Uint8));

+ saveFile.write(reinterpret_cast<char*>(&bp),sizeof(bp));

}

saveFile.write(reinterpret_cast<char*>(&p2.finalPack),sizeof(finalPack));

saveFile.close();

@@ -219,8 +190,8 @@ bool Replay::loadReplay(string filename)

loadFile.read(reinterpret_cast<char*>(&version),sizeof(Uint32));

switch (version)

{

- case 2:

- cout << "Loading a version 2 save game" << endl;

+ case 3:

+ cout << "Loading a version 3 save game" << endl;

Uint8 nrOfPlayers;

boardPackage bp;

loadFile.read(reinterpret_cast<char*>(&nrOfPlayers),sizeof(Uint8));

@@ -228,16 +199,7 @@ bool Replay::loadReplay(string filename)

bps.clear();

for (int i=0; (i<nrOfFrames);i++)

{

- loadFile.read(reinterpret_cast<char*>(&bp.time),sizeof(Uint32)); //Writing frames

- for (int k=0;k<6;k++)

- for (int g=0;g<13;g++)

- loadFile.read(reinterpret_cast<char*>(&bp.brick[k][g]),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.pixels),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.cursorX),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.cursorY),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.score),sizeof(Uint32));

- loadFile.read(reinterpret_cast<char*>(&bp.speed),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.chain),sizeof(Uint8));

+ loadFile.read(reinterpret_cast<char*>(&bp),sizeof(bp));

bps.push_back(bp);

}

loadFile.read(reinterpret_cast<char*>(&finalPack),sizeof(finalPack));

@@ -268,7 +230,7 @@ bool Replay::loadReplay2(string filename)

loadFile.read(reinterpret_cast<char*>(&version),sizeof(Uint32));

switch (version)

{

- case 2:

+ case 3:

Uint8 nrOfPlayers;

boardPackage bp;

loadFile.read(reinterpret_cast<char*>(&nrOfPlayers),sizeof(Uint8));

@@ -278,37 +240,19 @@ bool Replay::loadReplay2(string filename)

cout << "Only one player in replay" << endl;

return false;

}

- cout << "loading player 2" << endl;

+ cout << "loading player 3" << endl;

loadFile.read(reinterpret_cast<char*>(&nrOfFrames),sizeof(Uint32));

for (int i=0; (i<nrOfFrames);i++)

{

- loadFile.read(reinterpret_cast<char*>(&bp.time),sizeof(Uint32)); //Writing frames

- for (int k=0;k<6;k++)

- for (int g=0;g<13;g++)

- loadFile.read(reinterpret_cast<char*>(&bp.brick[k][g]),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.pixels),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.cursorX),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.cursorY),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.score),sizeof(Uint32));

- loadFile.read(reinterpret_cast<char*>(&bp.speed),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.chain),sizeof(Uint8));

- //bps.push_back(bp);

+ loadFile.read(reinterpret_cast<char*>(&bp),sizeof(bp));

+ //bps.push_back(bp); We have already read player 1 with another function

}

loadFile.read(reinterpret_cast<char*>(&finalPack),sizeof(finalPack));

loadFile.read(reinterpret_cast<char*>(&nrOfFrames),sizeof(Uint32));

bps.reserve(nrOfFrames);

for (int i=0; (i<nrOfFrames);i++)

{

- loadFile.read(reinterpret_cast<char*>(&bp.time),sizeof(Uint32)); //Writing frames

- for (int k=0;k<6;k++)

- for (int g=0;g<13;g++)

- loadFile.read(reinterpret_cast<char*>(&bp.brick[k][g]),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.pixels),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.cursorX),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.cursorY),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.score),sizeof(Uint32));

- loadFile.read(reinterpret_cast<char*>(&bp.speed),sizeof(Uint8));

- loadFile.read(reinterpret_cast<char*>(&bp.chain),sizeof(Uint8));

+ loadFile.read(reinterpret_cast<char*>(&bp),sizeof(bp));

bps.push_back(bp);

}

loadFile.read(reinterpret_cast<char*>(&finalPack),sizeof(finalPack));