Changeset 285
- Timestamp:
- Jan 25, 2011, 2:19:27 PM (10 years ago)
- Location:
- trunk/monsterz
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/monsterz/mash.cpp
r279 r285 35 35 Int2 cells[8 * 8]; 36 36 int npieces; 37 float timer; 37 38 38 39 enum 39 40 { 40 41 WAIT, 42 DUH, 41 43 POP, 42 44 DEAD, … … 94 96 if (allready) 95 97 { 96 Sampler::PlaySample(data-> pop);98 Sampler::PlaySample(data->duh); 97 99 for (int n = 0; n < data->npieces; n++) 98 100 data->pieces[n]->Pop(); 101 data->timer = 400.0f; 102 data->state = MashData::DUH; 103 } 104 break; 105 } 106 case MashData::DUH: 107 if ((data->timer -= deltams) < 0.0f) 108 { 109 Sampler::PlaySample(data->pop); 99 110 data->state = MashData::POP; 100 111 } 101 112 break; 102 }103 113 case MashData::POP: 104 114 { -
trunk/monsterz/piece.cpp
r284 r285 169 169 case PieceData::POP: 170 170 data->state = PieceData::POP; 171 data->timer = 400.0f;171 data->timer = 600.0f; 172 172 return 1; 173 173 default: … … 314 314 break; 315 315 case PieceData::POP: 316 id = data->id + 7; 316 if (data->timer < 60) 317 id = data->id + 9; 318 else if (data->timer < 120) 319 id = data->id + 8; 320 else if (data->timer < 180) 321 id = data->id + 7; 322 else if (data->timer < 240) 323 id = data->id + 6; 324 else 325 id = data->id + 5; 317 326 break; 318 327 case PieceData::DEAD:
Note: See TracChangeset
for help on using the changeset viewer.