From d2e6f3b5f32d573d13bf10d18bc1da2c319c8b24 Mon Sep 17 00:00:00 2001 From: Daveo Date: Wed, 4 Apr 2001 16:14:52 +0000 Subject: [PATCH] --- source/level/level.cpp | 73 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/source/level/level.cpp b/source/level/level.cpp index 91d2d5895..ad830b2f9 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -97,6 +97,58 @@ sLvlTab LvlTable[]= {LEVELS_CHAPTER01_LEVEL04_INF,LEVELS_CHAPTER01_LEVEL04_TBK,LEVELS_CHAPTER01_LEVEL0411_LVL,LEVELS_CHAPTER01_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER1_LEVEL4}, {LEVELS_CHAPTER01_LEVEL04_INF,LEVELS_CHAPTER01_LEVEL04_TBK,LEVELS_CHAPTER01_LEVEL0412_LVL,LEVELS_CHAPTER01_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER1_LEVEL4}, // C2 + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 95*16,29*16,98*16,32*16, 14*16,6*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, //48 + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 96*16,66*16,99*16,69*16, 5*16,5*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 1*16,42*16,4*16,45*16, 81*16,7*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 85*16,67*16,88*16,70*16, 86*16,22*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 1*16,63*16,4*16,66*16, 62*16,17*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 71*16,26*16,74*16,29*16, 3*16,85*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 93*16,15*16,96*16,18*16, 2*16,20*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, + + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 0*16,33*16,3*16,41*16, 27*16,19*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, //60 + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 122*16,126*16,134*16,129*16, 32*16,75*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 92*16,11*16,95*16,27*16, 64*16,93*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 76*16,10*16,79*16,23*16, 58*16,68*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + {LEVELS_CHAPTER02_LEVEL02_INF,LEVELS_CHAPTER02_LEVEL02_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL02_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL2}, + + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 129*16,75*16,133*16,84*16, 8*16,23*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, //72 + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 65*16,71*16,68*16,79*16, 3*16,8*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 169*16,16*16,174*16,37*16, 5*16,35*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 70*16,9*16,73*16,20*16, 5*16,76*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 131*16,13*16,137*16,26*16, 5*16,26*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 112*16,5*16,117*16,18*16, 3*16,18*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + {LEVELS_CHAPTER02_LEVEL03_INF,LEVELS_CHAPTER02_LEVEL03_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL03_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL3}, + + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 146*16,44*16,149*16,56*16, 4*16,16*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, //84 + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 127*16,15*16,129*16,29*16, 3*16,45*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 223*16,81*16,229*16,94*16, 4*16,42*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 130*16,52*16,134*16,63*16, 4*16,67*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 126*16,44*16,129*16,55*16, 3*16,35*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0112_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0412_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, +/* {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0101_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 95*16,29*16,98*16,32*16, 14*16,6*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, //48 {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0102_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 96*16,66*16,99*16,69*16, 5*16,5*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, {LEVELS_CHAPTER02_LEVEL01_INF,LEVELS_CHAPTER02_LEVEL01_TBK,LEVELS_CHAPTER02_LEVEL0103_LVL,LEVELS_CHAPTER02_LEVEL01_TEX, 1*16,42*16,4*16,45*16, 81*16,7*16, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL1}, @@ -148,6 +200,8 @@ sLvlTab LvlTable[]= {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0410_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0411_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, {LEVELS_CHAPTER02_LEVEL04_INF,LEVELS_CHAPTER02_LEVEL04_TBK,LEVELS_CHAPTER02_LEVEL0412_LVL,LEVELS_CHAPTER02_LEVEL04_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER2_LEVEL4}, + +*/ // C3 {LEVELS_CHAPTER03_LEVEL01_INF,LEVELS_CHAPTER03_LEVEL01_TBK,LEVELS_CHAPTER03_LEVEL0101_LVL,LEVELS_CHAPTER03_LEVEL01_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER3_LEVEL1}, //96 {LEVELS_CHAPTER03_LEVEL01_INF,LEVELS_CHAPTER03_LEVEL01_TBK,LEVELS_CHAPTER03_LEVEL0102_LVL,LEVELS_CHAPTER03_LEVEL01_TEX, 0,0,50,50, 268,160, CLayerBack::FLOWER,CLayerBack::FLOWER, CSoundMediator::SONG_CHAPTER3_LEVEL1}, @@ -443,9 +497,15 @@ sLvlTab *lvlTab=&LvlTable[s_globalLevelSelectThing]; { initNewLevel(lvlTab); } + // Load/unpack level - CFileIO::loadFileAtAddr(lvlTab->Level,PakBuffer); - int a=PAK_doUnpak(LevelBuffer,PakBuffer); +// CFileIO::loadFileAtAddr(lvlTab->Level,PakBuffer); + CFileIO::loadFileAtAddr(lvlTab->Level,LevelBuffer); +// PAK_doUnpak(LevelBuffer,PakBuffer); +//int NextLvl=GetNextLevel(s_globalLevelSelectThing); +// CFileIO::AddASyncFile(LvlTable[NextLvl].Level,PakBuffer); +// CFileIO::loadFileAtAddr(LvlTable[NextLvl].Level,PakBuffer); + DoPaulsTempCrap(&LvlTable[s_globalLevelSelectThing]); MapPos.vx=MapPos.vy=0; @@ -462,17 +522,20 @@ void CLevel::initNewLevel(sLvlTab *lvlTab) ASSERT(!TileBank); LevelInfo=(sLevelInfo*)CFileIO::loadFile(lvlTab->LevelInfo,"LevelInfo"); LevelBuffer=(u8*)MemAlloc(LevelInfo->MaxLvlSize,"Level Buffer"); - PakBuffer=(u8*)MemAlloc(LevelInfo->MaxPakSize,"Level Pak Buffer"); +// PakBuffer=(u8*)MemAlloc(LevelInfo->MaxPakSize,"Level Pak Buffer"); TileBank=(sTile *)CFileIO::loadFile(lvlTab->TileBank,"Tile Bank Data"); m_levelTPage=TPLoadTex(lvlTab->Tex); u16 *TypePtr=(u16*)MakePtr(LevelInfo,sizeof(sLevelInfo)); + for (int i=0; iActorCount; i++) { int ThisType=*TypePtr++; - printf("Type %i\n",ThisType); +// printf("Type %i\n",ThisType); CNpcEnemy::CacheActor(ThisType); } +// CFileIO::loadFileAtAddr(lvlTab->Level,PakBuffer); + } /*****************************************************************************/ @@ -563,6 +626,7 @@ sLvlHdr *LevelHdr=(sLvlHdr*)LevelBuffer; } // Actors + if (LevelHdr->ActorList) { @@ -576,6 +640,7 @@ sLvlHdr *LevelHdr=(sLvlHdr*)LevelBuffer; ThingPtr+=sizeof(sThingActor); ThingPtr+=ActorList[i]->PointCount*sizeof(u16)*2; } + if (Hdr->Count>8) Hdr->Count=0; } // Items if (LevelHdr->ItemList)