diff --git a/data/DataCache.scr b/data/DataCache.scr index dd35c9eb5..cd88b6077 100644 --- a/data/DataCache.scr +++ b/data/DataCache.scr @@ -44,6 +44,30 @@ levels/CHAPTER03_LEVEL0304.Lvl levels/CHAPTER03_LEVEL0305.Lvl levels/CHAPTER03_LEVEL0306.Lvl +levels/CHAPTER03_LEVEL04.TBK +levels/chapter03_level04.tex +levels/CHAPTER03_LEVEL0401.Lvl +levels/CHAPTER03_LEVEL0402.Lvl +levels/CHAPTER03_LEVEL0403.Lvl +levels/CHAPTER03_LEVEL0404.Lvl +levels/CHAPTER03_LEVEL0404x.Lvl +levels/CHAPTER03_LEVEL0405.Lvl +levels/CHAPTER03_LEVEL0406.Lvl + +levels/CHAPTER04_LEVEL01.TBK +levels/chapter04_level01.tex +levels/CHAPTER04_LEVEL0101.Lvl +levels/CHAPTER04_LEVEL0102.Lvl +levels/CHAPTER04_LEVEL0103.Lvl +levels/CHAPTER04_LEVEL0104.Lvl + +levels/CHAPTER04_LEVEL02.TBK +levels/chapter04_level02.tex +levels/CHAPTER04_LEVEL0201.Lvl +levels/CHAPTER04_LEVEL0202.Lvl +levels/CHAPTER04_LEVEL0203.Lvl +levels/CHAPTER04_LEVEL0204.Lvl + levels/CHAPTER04_LEVEL03.TBK levels/chapter04_level03.tex levels/CHAPTER04_LEVEL0301.Lvl diff --git a/data/translations/text.dat b/data/translations/text.dat index 9567e7441..8c2a323ca 100644 --- a/data/translations/text.dat +++ b/data/translations/text.dat @@ -196,6 +196,8 @@ eng=CHAPTER 3 Level 4 Part 2 eng=CHAPTER 3 Level 4 Part 3 [STR__DEBUG__LEVEL_SELECT_C3L404] eng=CHAPTER 3 Level 4 Part 4 +[STR__DEBUG__LEVEL_SELECT_C3L404X] +eng=CHAPTER 3 Level 4 Part 4x [STR__DEBUG__LEVEL_SELECT_C3L405] eng=CHAPTER 3 Level 4 Part 5 [STR__DEBUG__LEVEL_SELECT_C3L405] diff --git a/makefile.gfx b/makefile.gfx index 2d575ce19..f99725235 100644 --- a/makefile.gfx +++ b/makefile.gfx @@ -38,7 +38,7 @@ TEMP_FILE := $(TEMP_BUILD_DIR)/build.tmp #---------------------------------------------------------------------------- #--- Levels ----------------------------------------------------------------- #---------------------------------------------------------------------------- -LEVELS_OPTS := -t:8,8,1 -s:256 +LEVELS_OPTS := -t:8,5,1 -s:256 LEVELS_IN_DIR := $(GRAF_DIR)/levels LEVELS_OUT_DIR := $(DATA_OUT)/levels LEVELS_MAKEFILE_DIR := $(TEMP_BUILD_DIR)/levels @@ -58,15 +58,15 @@ LEVELS_CHAPTER02_LEVEL02 := LEVELS_CHAPTER02_LEVEL03 := LEVELS_CHAPTER02_LEVEL04 := -LEVELS_CHAPTER03 := LEVEL03 +LEVELS_CHAPTER03 := LEVEL03 LEVEL04 LEVELS_CHAPTER03_LEVEL01 := LEVELS_CHAPTER03_LEVEL02 := LEVELS_CHAPTER03_LEVEL03 := 01 02 03 04 05 06 -LEVELS_CHAPTER03_LEVEL04 := +LEVELS_CHAPTER03_LEVEL04 := 01 02 03 04 04x 05 06 -LEVELS_CHAPTER04 := LEVEL03 LEVEL04 -LEVELS_CHAPTER04_LEVEL01 := -LEVELS_CHAPTER04_LEVEL02 := +LEVELS_CHAPTER04 := LEVEL01 LEVEL02 LEVEL03 LEVEL04 +LEVELS_CHAPTER04_LEVEL01 := 01 02 03 04 +LEVELS_CHAPTER04_LEVEL02 := 01 02 03 04 05 LEVELS_CHAPTER04_LEVEL03 := 01 02 03 04 05 06 LEVELS_CHAPTER04_LEVEL04 := 01 02 03 04 05 06 07 diff --git a/source/frontend/start.cpp b/source/frontend/start.cpp index 30b10140d..c958229d6 100644 --- a/source/frontend/start.cpp +++ b/source/frontend/start.cpp @@ -130,48 +130,39 @@ CGUITextReadout::TextReadoutData CFrontEndStart::s_levelReadoutText[]= { 3,STR__DEBUG__LEVEL_SELECT_C3L304}, { 4,STR__DEBUG__LEVEL_SELECT_C3L305}, { 5,STR__DEBUG__LEVEL_SELECT_C3L306}, -/* - { 8,STR__DEBUG__LEVEL_SELECT_C3L401}, - { 9,STR__DEBUG__LEVEL_SELECT_C3L402}, - {10,STR__DEBUG__LEVEL_SELECT_C3L403}, - {11,STR__DEBUG__LEVEL_SELECT_C3L404}, - {12,STR__DEBUG__LEVEL_SELECT_C3L405}, - {13,STR__DEBUG__LEVEL_SELECT_C3L406}, - {14,STR__DEBUG__LEVEL_SELECT_C3L407}, - {15,STR__DEBUG__LEVEL_SELECT_C3L408}, - {16,STR__DEBUG__LEVEL_SELECT_C4L101}, - {17,STR__DEBUG__LEVEL_SELECT_C4L102}, - {18,STR__DEBUG__LEVEL_SELECT_C4L103}, - {19,STR__DEBUG__LEVEL_SELECT_C4L104}, - {20,STR__DEBUG__LEVEL_SELECT_C4L105}, - {21,STR__DEBUG__LEVEL_SELECT_C4L106}, - {22,STR__DEBUG__LEVEL_SELECT_C4L107}, - {23,STR__DEBUG__LEVEL_SELECT_C4L108}, + { 6,STR__DEBUG__LEVEL_SELECT_C3L401}, + { 7,STR__DEBUG__LEVEL_SELECT_C3L402}, + { 8,STR__DEBUG__LEVEL_SELECT_C3L403}, + { 9,STR__DEBUG__LEVEL_SELECT_C3L404}, + {10,STR__DEBUG__LEVEL_SELECT_C3L404X}, + {11,STR__DEBUG__LEVEL_SELECT_C3L405}, + {12,STR__DEBUG__LEVEL_SELECT_C3L406}, - {24,STR__DEBUG__LEVEL_SELECT_C4L201}, - {25,STR__DEBUG__LEVEL_SELECT_C4L202}, - {26,STR__DEBUG__LEVEL_SELECT_C4L203}, - {27,STR__DEBUG__LEVEL_SELECT_C4L204}, - {28,STR__DEBUG__LEVEL_SELECT_C4L205}, - {29,STR__DEBUG__LEVEL_SELECT_C4L206}, - {30,STR__DEBUG__LEVEL_SELECT_C4L207}, - {31,STR__DEBUG__LEVEL_SELECT_C4L208}, -*/ - {6,STR__DEBUG__LEVEL_SELECT_C4L301}, - {7,STR__DEBUG__LEVEL_SELECT_C4L302}, - {8,STR__DEBUG__LEVEL_SELECT_C4L303}, - {9,STR__DEBUG__LEVEL_SELECT_C4L304}, - {10,STR__DEBUG__LEVEL_SELECT_C4L305}, - {11,STR__DEBUG__LEVEL_SELECT_C4L306}, + {13,STR__DEBUG__LEVEL_SELECT_C4L101}, + {14,STR__DEBUG__LEVEL_SELECT_C4L102}, + {15,STR__DEBUG__LEVEL_SELECT_C4L103}, + {16,STR__DEBUG__LEVEL_SELECT_C4L104}, - {12,STR__DEBUG__LEVEL_SELECT_C4L401}, - {13,STR__DEBUG__LEVEL_SELECT_C4L402}, - {14,STR__DEBUG__LEVEL_SELECT_C4L403}, - {15,STR__DEBUG__LEVEL_SELECT_C4L404}, - {16,STR__DEBUG__LEVEL_SELECT_C4L405}, - {17,STR__DEBUG__LEVEL_SELECT_C4L406}, - {18,STR__DEBUG__LEVEL_SELECT_C4L407}, + {17,STR__DEBUG__LEVEL_SELECT_C4L201}, + {18,STR__DEBUG__LEVEL_SELECT_C4L202}, + {19,STR__DEBUG__LEVEL_SELECT_C4L203}, + {20,STR__DEBUG__LEVEL_SELECT_C4L204}, + + {21,STR__DEBUG__LEVEL_SELECT_C4L301}, + {22,STR__DEBUG__LEVEL_SELECT_C4L302}, + {23,STR__DEBUG__LEVEL_SELECT_C4L303}, + {24,STR__DEBUG__LEVEL_SELECT_C4L304}, + {25,STR__DEBUG__LEVEL_SELECT_C4L305}, + {26,STR__DEBUG__LEVEL_SELECT_C4L306}, + + {27,STR__DEBUG__LEVEL_SELECT_C4L401}, + {28,STR__DEBUG__LEVEL_SELECT_C4L402}, + {29,STR__DEBUG__LEVEL_SELECT_C4L403}, + {30,STR__DEBUG__LEVEL_SELECT_C4L404}, + {31,STR__DEBUG__LEVEL_SELECT_C4L405}, + {32,STR__DEBUG__LEVEL_SELECT_C4L406}, + {33,STR__DEBUG__LEVEL_SELECT_C4L407}, }; extern int s_globalLevelSelectThing; diff --git a/source/level/layertile3d.cpp b/source/level/layertile3d.cpp index 49168ab25..c413640fa 100644 --- a/source/level/layertile3d.cpp +++ b/source/level/layertile3d.cpp @@ -260,7 +260,7 @@ sOT *ThisOT=OtPtr+LayerOT; { int TriCount=*TileTable++; // Get Tri Count sTri *NextList=TList+TriCount; - if (Flags & 1) +// if (Flags & 1) { while (TriCount--) { diff --git a/source/level/level.cpp b/source/level/level.cpp index e64387e87..5aa78b13a 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -36,26 +36,38 @@ sLvlTab LvlTable[]= {LEVELS_CHAPTER03_LEVEL03_TBK,LEVELS_CHAPTER03_LEVEL0305_LVL,LEVELS_CHAPTER03_LEVEL03_TEX}, // 4 {LEVELS_CHAPTER03_LEVEL03_TBK,LEVELS_CHAPTER03_LEVEL0306_LVL,LEVELS_CHAPTER03_LEVEL03_TEX}, // 5 // C3 L4 -// {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0401_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // + {LEVELS_CHAPTER03_LEVEL04_TBK,LEVELS_CHAPTER03_LEVEL0401_LVL,LEVELS_CHAPTER03_LEVEL04_TEX}, // + {LEVELS_CHAPTER03_LEVEL04_TBK,LEVELS_CHAPTER03_LEVEL0402_LVL,LEVELS_CHAPTER03_LEVEL04_TEX}, // + {LEVELS_CHAPTER03_LEVEL04_TBK,LEVELS_CHAPTER03_LEVEL0403_LVL,LEVELS_CHAPTER03_LEVEL04_TEX}, // + {LEVELS_CHAPTER03_LEVEL04_TBK,LEVELS_CHAPTER03_LEVEL0404_LVL,LEVELS_CHAPTER03_LEVEL04_TEX}, // + {LEVELS_CHAPTER03_LEVEL04_TBK,LEVELS_CHAPTER03_LEVEL0404X_LVL,LEVELS_CHAPTER03_LEVEL04_TEX}, // + {LEVELS_CHAPTER03_LEVEL04_TBK,LEVELS_CHAPTER03_LEVEL0405_LVL,LEVELS_CHAPTER03_LEVEL04_TEX}, // + {LEVELS_CHAPTER03_LEVEL04_TBK,LEVELS_CHAPTER03_LEVEL0406_LVL,LEVELS_CHAPTER03_LEVEL04_TEX}, // // C4 L1 -// {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0401_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // + {LEVELS_CHAPTER04_LEVEL01_TBK,LEVELS_CHAPTER04_LEVEL0101_LVL,LEVELS_CHAPTER04_LEVEL01_TEX}, // + {LEVELS_CHAPTER04_LEVEL01_TBK,LEVELS_CHAPTER04_LEVEL0102_LVL,LEVELS_CHAPTER04_LEVEL01_TEX}, // + {LEVELS_CHAPTER04_LEVEL01_TBK,LEVELS_CHAPTER04_LEVEL0103_LVL,LEVELS_CHAPTER04_LEVEL01_TEX}, // + {LEVELS_CHAPTER04_LEVEL01_TBK,LEVELS_CHAPTER04_LEVEL0104_LVL,LEVELS_CHAPTER04_LEVEL01_TEX}, // // C4 L2 -// {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0401_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // + {LEVELS_CHAPTER04_LEVEL02_TBK,LEVELS_CHAPTER04_LEVEL0201_LVL,LEVELS_CHAPTER04_LEVEL02_TEX}, // 6 + {LEVELS_CHAPTER04_LEVEL02_TBK,LEVELS_CHAPTER04_LEVEL0202_LVL,LEVELS_CHAPTER04_LEVEL02_TEX}, // 7 + {LEVELS_CHAPTER04_LEVEL02_TBK,LEVELS_CHAPTER04_LEVEL0203_LVL,LEVELS_CHAPTER04_LEVEL02_TEX}, // 8 + {LEVELS_CHAPTER04_LEVEL02_TBK,LEVELS_CHAPTER04_LEVEL0204_LVL,LEVELS_CHAPTER04_LEVEL02_TEX}, // 9 // C4 L3 - 6 parts - {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0301_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 6 - {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0302_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 7 - {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0303_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 8 - {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0304_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 9 - {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0305_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 10 - {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0306_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 11 + {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0301_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 10 + {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0302_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 11 + {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0303_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 12 + {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0304_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 13 + {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0305_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 14 + {LEVELS_CHAPTER04_LEVEL03_TBK,LEVELS_CHAPTER04_LEVEL0306_LVL,LEVELS_CHAPTER04_LEVEL03_TEX}, // 15 // C3 L4 - 7 parts - {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0401_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 12 - {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0402_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 13 - {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0403_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 14 - {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0404_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 15 - {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0405_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 16 - {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0406_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 17 - {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0407_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 18 + {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0401_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 16 + {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0402_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 17 + {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0403_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 18 + {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0404_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 19 + {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0405_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 20 + {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0406_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 21 + {LEVELS_CHAPTER04_LEVEL04_TBK,LEVELS_CHAPTER04_LEVEL0407_LVL,LEVELS_CHAPTER04_LEVEL04_TEX}, // 22 }; @@ -90,7 +102,7 @@ sVtx *VtxList=(sVtx*)MakePtr(TileBankHdr,TileBankHdr->VtxList); sTile *TileList=(sTile*)MakePtr(TileBankHdr,TileBankHdr->TileList); // Back - if (LevelHdr->BackLayer) +// if (LevelHdr->BackLayer) { sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->BackLayer); // CLayerTile *NewLayer=new ("Back Layer") CLayerTileSolid(Layer, TileList, TriList, QuadList, VtxList); diff --git a/tools/Data/bin/MkLevel.exe b/tools/Data/bin/MkLevel.exe index 2863d1265..d373c515c 100644 Binary files a/tools/Data/bin/MkLevel.exe and b/tools/Data/bin/MkLevel.exe differ