This commit is contained in:
Paul 2001-05-29 19:48:47 +00:00
parent 27fa40ecf9
commit a2d1fce396
3 changed files with 40 additions and 40 deletions

View file

@ -182,11 +182,11 @@ PICKUP_GFX_DIR := $(GRAF_DIR)/pickups
PICKUP_GFX := +spatula +token +pants +health100 +health50 +health25 +glint1 +glint2 +glint3 +glint4 \ PICKUP_GFX := +spatula +token +pants +health100 +health50 +health25 +glint1 +glint2 +glint3 +glint4 \
+jellyammo +bubblemixture +bubblewand +glasses +shoe +balloon +balloonburst +helmet \ +jellyammo +bubblemixture +bubblewand +glasses +shoe +balloon +balloonburst +helmet \
+blower +launcher +net \ +blower +launcher +net \
+c1_l1_jelly +c1_l2_seaweed +c1_l3_seanutbutter +c1_l4_breadslice \ +c1_l1_quest_item +c1_l2_quest_item +c1_l3_quest_item +c1_l4_quest_item \
+c2_l1_falseteeth +c2_l2_kelpkream +c2_l3_mudpack +c2_l4_sponge \ +c2_l1_quest_item +c2_l2_quest_item +c2_l3_quest_item +c2_l4_quest_item \
+c3_l1_slippers +c3_l2_clambra +c3_l3_starfishmask +c3_l4_superpantz \ +c3_l1_quest_item +c3_l2_quest_item +c3_l3_quest_item +c3_l4_quest_item \
+c4_coin +c4_kelpbar \ +c4_quest_item_1 +c4_quest_item_2 \
+c5_l1_hammer +c5_l2_ariel +c5_l3_oilcan +c5_l4_wrench +c5_l1_quest_item +c5_l2_quest_item +c5_l3_quest_item +c5_l4_quest_item
PICKUP_GFX_IN := $(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp) PICKUP_GFX_IN := $(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp)
INGAMEFX_GFX_DIR := $(GRAF_DIR)/ingamefx INGAMEFX_GFX_DIR := $(GRAF_DIR)/ingamefx

View file

@ -95,31 +95,31 @@ CMapScene::sMapLevelData CMapScene::s_mapLevelData[5]=
{ {
{ MAP_C1_L1_GFX, MAP_C1_L2_GFX, MAP_C1_L3_GFX, MAP_C1_L4_GFX, MAP_C1_BOSS_GFX, MAP_C1_FAIR_GFX }, { MAP_C1_L1_GFX, MAP_C1_L2_GFX, MAP_C1_L3_GFX, MAP_C1_L4_GFX, MAP_C1_BOSS_GFX, MAP_C1_FAIR_GFX },
{ 0, 1, 2, 3, -1, 20 }, { 0, 1, 2, 3, -1, 20 },
{ FRM__C1_L1_JELLY, FRM__C1_L2_SEAWEED, FRM__C1_L3_SEANUTBUTTER, FRM__C1_L4_BREADSLICE }, { FRM__C1_L1_QUEST_ITEM, FRM__C1_L2_QUEST_ITEM, FRM__C1_L3_QUEST_ITEM, FRM__C1_L4_QUEST_ITEM},
}, },
// Chapter 2 // Chapter 2
{ {
{ MAP_C2_L1_GFX, MAP_C2_L2_GFX, MAP_C2_L3_GFX, MAP_C2_L4_GFX, MAP_C2_BOSS_GFX, MAP_C2_FAIR_GFX }, { MAP_C2_L1_GFX, MAP_C2_L2_GFX, MAP_C2_L3_GFX, MAP_C2_L4_GFX, MAP_C2_BOSS_GFX, MAP_C2_FAIR_GFX },
{ 4, 5, 6, 7, -1, 21 }, { 4, 5, 6, 7, -1, 21 },
{ FRM__C2_L1_FALSETEETH, FRM__C2_L2_KELPKREAM, FRM__C2_L3_MUDPACK, FRM__C2_L4_SPONGE }, { FRM__C2_L1_QUEST_ITEM, FRM__C2_L2_QUEST_ITEM, FRM__C2_L3_QUEST_ITEM, FRM__C2_L4_QUEST_ITEM},
}, },
// Chapter 3 // Chapter 3
{ {
{ MAP_C3_L1_GFX, MAP_C3_L2_GFX, MAP_C3_L3_GFX, MAP_C3_L4_GFX, MAP_C3_BOSS_GFX, MAP_C3_FAIR_GFX }, { MAP_C3_L1_GFX, MAP_C3_L2_GFX, MAP_C3_L3_GFX, MAP_C3_L4_GFX, MAP_C3_BOSS_GFX, MAP_C3_FAIR_GFX },
{ 8, 9, 10, 11, -1, 22 }, { 8, 9, 10, 11, -1, 22 },
{ FRM__C3_L1_SLIPPERS, FRM__C3_L2_CLAMBRA, FRM__C3_L3_STARFISHMASK, FRM__C3_L4_SUPERPANTZ }, { FRM__C3_L1_QUEST_ITEM, FRM__C3_L2_QUEST_ITEM, FRM__C3_L3_QUEST_ITEM, FRM__C3_L4_QUEST_ITEM},
}, },
// Chapter 4 // Chapter 4
{ {
{ MAP_C4_L1_GFX, MAP_C4_L2_GFX, MAP_C4_L3_GFX, MAP_C4_L4_GFX, MAP_C4_BOSS_GFX, MAP_C4_FAIR_GFX }, { MAP_C4_L1_GFX, MAP_C4_L2_GFX, MAP_C4_L3_GFX, MAP_C4_L4_GFX, MAP_C4_BOSS_GFX, MAP_C4_FAIR_GFX },
{ 12, 13, 14, 15, -1, 23 }, { 12, 13, 14, 15, -1, 23 },
{ FRM__C4_COIN, FRM__C4_COIN, FRM__C4_COIN, FRM__C4_KELPBAR }, { FRM__C4_QUEST_ITEM_1, FRM__C4_QUEST_ITEM_1, FRM__C4_QUEST_ITEM_1, FRM__C4_QUEST_ITEM_2 },
}, },
// Chapter 5 // Chapter 5
{ {
{ MAP_C5_L1_GFX, MAP_C5_L2_GFX, MAP_C5_L3_GFX, MAP_C5_L4_GFX, MAP_C5_BOSS_GFX, MAP_C5_FAIR_GFX }, { MAP_C5_L1_GFX, MAP_C5_L2_GFX, MAP_C5_L3_GFX, MAP_C5_L4_GFX, MAP_C5_BOSS_GFX, MAP_C5_FAIR_GFX },
{ 16, 17, 18, 19, -1, 24 }, { 16, 17, 18, 19, -1, 24 },
{ FRM__C5_L1_HAMMER, FRM__C5_L2_ARIEL, FRM__C5_L3_OILCAN, FRM__C5_L4_WRENCH }, { FRM__C5_L1_QUEST_ITEM, FRM__C5_L2_QUEST_ITEM, FRM__C5_L3_QUEST_ITEM, FRM__C5_L4_QUEST_ITEM},
}, },
}; };

View file

@ -75,26 +75,26 @@ typedef struct
static const sQuestItemMap s_questItemMap[]= static const sQuestItemMap s_questItemMap[]=
{ {
{ 1,1, FRM__C1_L1_JELLY }, { 1,1, FRM__C1_L1_QUEST_ITEM },
{ 1,2, FRM__C1_L2_SEAWEED }, { 1,2, FRM__C1_L2_QUEST_ITEM },
{ 1,3, FRM__C1_L3_SEANUTBUTTER }, { 1,3, FRM__C1_L3_QUEST_ITEM },
{ 1,4, FRM__C1_L4_BREADSLICE }, { 1,4, FRM__C1_L4_QUEST_ITEM },
{ 2,1, FRM__C2_L1_FALSETEETH }, { 2,1, FRM__C2_L1_QUEST_ITEM },
{ 2,2, FRM__C2_L2_KELPKREAM }, { 2,2, FRM__C2_L2_QUEST_ITEM },
{ 2,3, FRM__C2_L3_MUDPACK }, { 2,3, FRM__C2_L3_QUEST_ITEM },
{ 2,4, FRM__C2_L4_SPONGE }, { 2,4, FRM__C2_L4_QUEST_ITEM },
{ 3,1, FRM__C3_L1_SLIPPERS }, { 3,1, FRM__C3_L1_QUEST_ITEM },
{ 3,2, FRM__C3_L2_CLAMBRA }, { 3,2, FRM__C3_L2_QUEST_ITEM },
{ 3,3, FRM__C3_L3_STARFISHMASK }, { 3,3, FRM__C3_L3_QUEST_ITEM },
{ 3,4, FRM__C3_L4_SUPERPANTZ }, { 3,4, FRM__C3_L4_QUEST_ITEM },
{ 4,1, FRM__C4_COIN }, { 4,1, FRM__C4_QUEST_ITEM_1 },
{ 4,2, FRM__C4_COIN }, { 4,2, FRM__C4_QUEST_ITEM_1 },
{ 4,3, FRM__C4_COIN }, { 4,3, FRM__C4_QUEST_ITEM_1 },
{ 4,4, FRM__C4_KELPBAR }, { 4,4, FRM__C4_QUEST_ITEM_2 },
{ 5,1, FRM__C5_L1_HAMMER }, { 5,1, FRM__C5_L1_QUEST_ITEM },
{ 5,2, FRM__C5_L2_ARIEL }, { 5,2, FRM__C5_L2_QUEST_ITEM },
{ 5,3, FRM__C5_L3_OILCAN }, { 5,3, FRM__C5_L3_QUEST_ITEM },
{ 5,4, FRM__C5_L4_WRENCH }, { 5,4, FRM__C5_L4_QUEST_ITEM },
}; };
static const int s_numQuestItemMap=sizeof(s_questItemMap)/sizeof(sQuestItemMap); static const int s_numQuestItemMap=sizeof(s_questItemMap)/sizeof(sQuestItemMap);