matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct initialisation of FIGH

Browse Source
This commit is contained in:
Simon Robertshaw 2012-09-14 22:23:35 +01:00
parent 486b34ebe5
commit 5b9032fb3f
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/simulation/Simulation.cpp
View File

@ -81,30 +81,33 @@ int Simulation::Load(int fullX, int fullY, GameSave * save)
elementCount[tempPart.type]++; elementCount[tempPart.type]++;
} }
if (tempPart.type == PT_STKM) if (parts[i].type == PT_STKM)
{ {
Element_STKM::STKM_init_legs(this, &player, i); Element_STKM::STKM_init_legs(this, &player, i);
player.spwn = 1; player.spwn = 1;
player.elem = PT_DUST; player.elem = PT_DUST;
} }
else if (tempPart.type == PT_STKM2) else if (parts[i].type == PT_STKM2)
{ {
Element_STKM::STKM_init_legs(this, &player2, i); Element_STKM::STKM_init_legs(this, &player2, i);
player2.spwn = 1; player2.spwn = 1;
player2.elem = PT_DUST; player2.elem = PT_DUST;
} }
else if (tempPart.type == PT_FIGH) else if (parts[i].type == PT_FIGH)
{ {
//TODO: 100 should be replaced with a macro //TODO: 100 should be replaced with a macro
unsigned char fcount = 0; for(int fcount = 0; fcount < 100; fcount++)
while (fcount < 100 && fcount < (fighcount+1) && fighters[fcount].spwn==1) fcount++;
if (fcount < 100 && fighters[fcount].spwn==0)
{ {
tempPart.tmp = fcount; if(!fighters[fcount].spwn)
fighters[fcount].spwn = 1; {
fighters[fcount].elem = PT_DUST; fighcount++;
fighcount++; //currentPart.tmp = fcount;
Element_STKM::STKM_init_legs(this, &(fighters[fcount]), i); parts[i].tmp = fcount;
fighters[fcount].spwn = 1;
fighters[fcount].elem = PT_DUST;
Element_STKM::STKM_init_legs(this, &(fighters[fcount]), i);
break;
}
} }
} }
} }