X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=78ce1be2a446e5e0d283171c3bf0d24e46fb98d2;hb=6a5685ceb73a6e3375ff32c0d6ff383eac9a2a9d;hp=225f204fe0d0c373b4e01ff8bc7d2a0990d02540;hpb=9fc7b9df17e6cc518d82ea6572ed69dc07f49689;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index 225f204f..78ce1be2 100644 --- a/src/main.c +++ b/src/main.c @@ -78,12 +78,13 @@ short Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; short StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; short Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; boolean Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; -short JustHit[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +short JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; short AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA]; -unsigned long Elementeigenschaften[MAX_ELEMENTS]; +unsigned long Elementeigenschaften1[MAX_ELEMENTS]; +unsigned long Elementeigenschaften2[MAX_ELEMENTS]; -int level_nr, leveldir_nr, num_leveldirs; +int level_nr; int lev_fieldx,lev_fieldy, scroll_x,scroll_y; int FX = SX, FY = SY, ScrollStepSize; @@ -98,15 +99,10 @@ int SBY_Upper, SBY_Lower; int ZX,ZY, ExitX,ExitY; int AllPlayersGone; int FrameCounter, TimeFrames, TimePlayed, TimeLeft; -int MampferMax, MampferNr; -boolean SiebAktiv; -int SiebCount; - -int game_emulation = EMU_NONE; boolean network_player_action_received = FALSE; -struct LevelDirInfo leveldir[MAX_LEVDIR_ENTRIES]; +struct LevelDirInfo *leveldir_first = NULL, *leveldir_current = NULL; struct LevelInfo level; struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL; struct HiScore highscore[MAX_SCORE_ENTRIES]; @@ -114,8 +110,8 @@ struct SoundInfo Sound[NUM_SOUNDS]; struct TapeInfo tape; struct OptionInfo options; struct SetupInfo setup; -struct SetupFileList *setup_list = NULL; -struct SetupFileList *level_setup_list = NULL; +struct GameInfo game; +struct GlobalInfo global; /* data needed for playing sounds */ char *sound_name[NUM_SOUNDS] = @@ -180,7 +176,8 @@ char *sound_name[NUM_SOUNDS] = "boom", "booom", "exit", - "empty" + "empty", + "gate" }; /* background music */ @@ -198,7 +195,7 @@ int num_bg_loops = sizeof(background_loop)/sizeof(int); char *element_info[] = { - "empty space", + "empty space", /* 0 */ "sand", "normal wall", "round wall", @@ -208,7 +205,7 @@ char *element_info[] = "closed exit", "player", "bug", - "spaceship", + "spaceship", /* 10 */ "yam yam", "robot", "steel wall", @@ -218,7 +215,7 @@ char *element_info[] = "quicksand with rock", "amoeba drop", "bomb", - "magic wall", + "magic wall", /* 20 */ "speed ball", "acid pool", "dropping amoeba", @@ -228,7 +225,7 @@ char *element_info[] = "biomaze", "burning dynamite", "unknown", - "magic wheel", + "magic wheel", /* 30 */ "running wire", "red key", "yellow key", @@ -238,17 +235,17 @@ char *element_info[] = "yellow door", "green door", "blue door", - "grey door (opened by red key)", - "grey door (opened by yellow key)", - "grey door (opened by green key)", - "grey door (opened by blue key)", + "gray door (opened by red key)", /* 40 */ + "gray door (opened by yellow key)", + "gray door (opened by green key)", + "gray door (opened by blue key)", "dynamite", "pac man", "invisible normal wall", "light bulb (dark)", "ligh bulb (glowing)", "wall with emerald", - "wall with diamond", + "wall with diamond", /* 50 */ "amoeba with content", "amoeba (BD style)", "time orb (full)", @@ -258,7 +255,7 @@ char *element_info[] = "yellow emerald", "wall with BD style diamond", "wall with yellow emerald", - "dark yam yam", + "dark yam yam", /* 60 */ "magic wall (BD style)", "invisible steel wall", "dynabomb", @@ -268,7 +265,7 @@ char *element_info[] = "sokoban object", "sokoban empty field", "sokoban field with object", - "butterfly (starts moving right)", + "butterfly (starts moving right)", /* 70 */ "butterfly (starts moving up)", "butterfly (starts moving left)", "butterfly (starts moving down)", @@ -278,7 +275,7 @@ char *element_info[] = "firefly (starts moving down)", "butterfly", "firefly", - "yellow player", + "yellow player", /* 80 */ "red player", "green player", "blue player", @@ -288,7 +285,7 @@ char *element_info[] = "bug (starts moving down)", "spaceship (starts moving right)", "spaceship (starts moving up)", - "spaceship (starts moving left)", + "spaceship (starts moving left)", /* 90 */ "spaceship (starts moving down)", "pac man (starts moving right)", "pac man (starts moving up)", @@ -298,7 +295,7 @@ char *element_info[] = "violet emerald", "wall with red emerald", "wall with violet emerald", - "unknown", + "unknown", /* 100 */ "unknown", "unknown", "unknown", @@ -308,7 +305,7 @@ char *element_info[] = "open exit", "unknown", "amoeba", - "mole", + "mole", /* 110 */ "penguin", "satellite", "arrow left", @@ -318,7 +315,7 @@ char *element_info[] = "pig", "fire breathing dragon", "unknown", - "letter ' '", + "letter ' '", /* 120 */ "letter '!'", "letter '\"'", "letter '#'", @@ -328,7 +325,7 @@ char *element_info[] = "letter '''", "letter '('", "letter ')'", - "letter '*'", + "letter '*'", /* 130 */ "letter '+'", "letter ','", "letter '-'", @@ -338,7 +335,7 @@ char *element_info[] = "letter '1'", "letter '2'", "letter '3'", - "letter '4'", + "letter '4'", /* 140 */ "letter '5'", "letter '6'", "letter '7'", @@ -348,7 +345,7 @@ char *element_info[] = "letter ';'", "letter '<'", "letter '='", - "letter '>'", + "letter '>'", /* 150 */ "letter '?'", "letter '@'", "letter 'A'", @@ -358,7 +355,7 @@ char *element_info[] = "letter 'E'", "letter 'F'", "letter 'G'", - "letter 'H'", + "letter 'H'", /* 160 */ "letter 'I'", "letter 'J'", "letter 'K'", @@ -368,7 +365,7 @@ char *element_info[] = "letter 'O'", "letter 'P'", "letter 'Q'", - "letter 'R'", + "letter 'R'", /* 170 */ "letter 'S'", "letter 'T'", "letter 'U'", @@ -378,7 +375,7 @@ char *element_info[] = "letter 'Y'", "letter 'Z'", "letter 'Ä'", - "letter 'Ö'", + "letter 'Ö'", /* 180 */ "letter 'Ü'", "letter '^'", "letter ''", @@ -388,6 +385,7 @@ char *element_info[] = "letter ''", "letter ''", "letter ''", + "letter ''", /* 190 */ "letter ''", "letter ''", "letter ''", @@ -397,8 +395,7 @@ char *element_info[] = "letter ''", "letter ''", "letter ''", - "letter ''", - "growing wall (horizontally)", + "growing wall (horizontally)", /* 200 */ "growing wall (vertically)", "growing wall (all directions)", "unused", @@ -408,7 +405,7 @@ char *element_info[] = "unused", "unused", "unused", - "empty space", + "empty space", /* 210 */ "zonk", "base", "murphy", @@ -418,7 +415,7 @@ char *element_info[] = "exit", "orange disk", "port (leading right)", - "port (leading down)", + "port (leading down)", /* 220 */ "port (leading left)", "port (leading up)", "port (leading right)", @@ -428,7 +425,7 @@ char *element_info[] = "snik snak", "yellow disk", "terminal", - "red disk", + "red disk", /* 230 */ "port (vertically)", "port (horizontally)", "port (all directions)", @@ -438,7 +435,7 @@ char *element_info[] = "chip (right half)", "hardware", "hardware", - "hardware", + "hardware", /* 240 */ "hardware", "hardware", "hardware", @@ -448,12 +445,108 @@ char *element_info[] = "hardware", "chip (upper half)", "chip (lower half)", + "unknown", /* 250 */ "unknown", "unknown", "unknown", "unknown", "unknown", - "unknown" + + /* 256 */ + + "pearl", /* (256) */ + "crystal", + "wall with pearl", + "wall with crystal", + "white door", /* 260 */ + "gray door (opened by white key)", + "white key", + "shield (passive)", + "extra time", + "switch gate (open)", + "switch gate (closed)", + "switch for switch gate", + "switch for switch gate", + "-", + "-", /* 270 */ + "red conveyor belt (left)", + "red conveyor belt (middle)", + "red conveyor belt (right)", + "switch for red conveyor belt (left)", + "switch for red conveyor belt (middle)", + "switch for red conveyor belt (right)", + "yellow conveyor belt (left)", + "yellow conveyor belt (middle)", + "yellow conveyor belt (right)", + "switch for yellow conveyor belt (left)", /* 280 */ + "switch for yellow conveyor belt (middle)", + "switch for yellow conveyor belt (right)", + "green conveyor belt (left)", + "green conveyor belt (middle)", + "green conveyor belt (right)", + "switch for green conveyor belt (left)", + "switch for green conveyor belt (middle)", + "switch for green conveyor belt (right)", + "blue conveyor belt (left)", + "blue conveyor belt (middle)", /* 290 */ + "blue conveyor belt (right)", + "switch for blue conveyor belt (left)", + "switch for blue conveyor belt (middle)", + "switch for blue conveyor belt (right)", + "land mine", + "mail envelope", + "light switch (off)", + "light switch (on)", + "sign (exclamation)", + "sign (radio activity)", /* 300 */ + "sign (stop)", + "sign (wheel chair)", + "sign (parking)", + "sign (one way)", + "sign (heart)", + "sign (triangle)", + "sign (round)", + "sign (exit)", + "sign (yin yang)", + "sign (other)", /* 310 */ + "mole (starts moving left)", + "mole (starts moving right)", + "mole (starts moving up)", + "mole (starts moving down)", + "steel wall (slanted)", + "invisible sand", + "dx unknown 15", + "dx unknown 42", + "-", + "-", /* 320 */ + "shield (active, kills enemies)", + "time gate (open)", + "time gate (closed)", + "switch for time gate", + "switch for time gate", + "balloon", + "send balloon to the left", + "send balloon to the right", + "send balloon up", + "send balloon down", /* 330 */ + "send balloon in any direction", + "steel wall", + "steel wall", + "steel wall", + "steel wall", + "normal wall", + "normal wall", + "normal wall", + "normal wall", + "normal wall", /* 340 */ + "normal wall", + "normal wall", + "normal wall", + "-" + + /* + "-------------------------------", + */ }; int main(int argc, char *argv[])