X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=f6439e8fe3487e06deeccef6658d594404657698;hb=f5356588a234e34e349c0b1eba02008655fdee87;hp=565394fc72dc071c39105f94bd52c318c146c9d1;hpb=cdf554f6229e6eafe2f19519adfe90c74e3449f2;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index 565394fc..f6439e8f 100644 --- a/src/main.c +++ b/src/main.c @@ -78,32 +78,27 @@ 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 lev_fieldx,lev_fieldy, scroll_x,scroll_y; -int FX = SX, FY = SY, ScrollStepSize = TILEX/8; +int FX = SX, FY = SY, ScrollStepSize; int ScreenMovDir = MV_NO_MOVING, ScreenMovPos = 0; int ScreenGfxPos = 0; int BorderElement = EL_BETON; int GameFrameDelay = GAME_FRAME_DELAY; int FfwdFrameDelay = FFWD_FRAME_DELAY; -int MoveSpeed = 8; int BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1; int SBX_Left, SBX_Right; 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; @@ -117,6 +112,8 @@ 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] = @@ -181,7 +178,8 @@ char *sound_name[NUM_SOUNDS] = "boom", "booom", "exit", - "empty" + "empty", + "gate" }; /* background music */ @@ -199,7 +197,7 @@ int num_bg_loops = sizeof(background_loop)/sizeof(int); char *element_info[] = { - "empty space", + "empty space", /* 0 */ "sand", "normal wall", "round wall", @@ -209,7 +207,7 @@ char *element_info[] = "closed exit", "player", "bug", - "spaceship", + "spaceship", /* 10 */ "yam yam", "robot", "steel wall", @@ -219,7 +217,7 @@ char *element_info[] = "quicksand with rock", "amoeba drop", "bomb", - "magic wall", + "magic wall", /* 20 */ "speed ball", "acid pool", "dropping amoeba", @@ -229,7 +227,7 @@ char *element_info[] = "biomaze", "burning dynamite", "unknown", - "magic wheel", + "magic wheel", /* 30 */ "running wire", "red key", "yellow key", @@ -239,17 +237,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)", @@ -259,7 +257,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", @@ -269,7 +267,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)", @@ -279,7 +277,7 @@ char *element_info[] = "firefly (starts moving down)", "butterfly", "firefly", - "yellow player", + "yellow player", /* 80 */ "red player", "green player", "blue player", @@ -289,7 +287,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)", @@ -299,7 +297,7 @@ char *element_info[] = "violet emerald", "wall with red emerald", "wall with violet emerald", - "unknown", + "unknown", /* 100 */ "unknown", "unknown", "unknown", @@ -309,7 +307,7 @@ char *element_info[] = "open exit", "unknown", "amoeba", - "mole", + "mole", /* 110 */ "penguin", "satellite", "arrow left", @@ -319,87 +317,87 @@ char *element_info[] = "pig", "fire breathing dragon", "unknown", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "letter", - "growing wall (horizontally)", + "letter ' '", /* 120 */ + "letter '!'", + "letter '\"'", + "letter '#'", + "letter '$'", + "letter '%'", + "letter '&'", + "letter '''", + "letter '('", + "letter ')'", + "letter '*'", /* 130 */ + "letter '+'", + "letter ','", + "letter '-'", + "letter '.'", + "letter '/'", + "letter '0'", + "letter '1'", + "letter '2'", + "letter '3'", + "letter '4'", /* 140 */ + "letter '5'", + "letter '6'", + "letter '7'", + "letter '8'", + "letter '9'", + "letter ':'", + "letter ';'", + "letter '<'", + "letter '='", + "letter '>'", /* 150 */ + "letter '?'", + "letter '@'", + "letter 'A'", + "letter 'B'", + "letter 'C'", + "letter 'D'", + "letter 'E'", + "letter 'F'", + "letter 'G'", + "letter 'H'", /* 160 */ + "letter 'I'", + "letter 'J'", + "letter 'K'", + "letter 'L'", + "letter 'M'", + "letter 'N'", + "letter 'O'", + "letter 'P'", + "letter 'Q'", + "letter 'R'", /* 170 */ + "letter 'S'", + "letter 'T'", + "letter 'U'", + "letter 'V'", + "letter 'W'", + "letter 'X'", + "letter 'Y'", + "letter 'Z'", + "letter 'Ä'", + "letter 'Ö'", /* 180 */ + "letter 'Ü'", + "letter '^'", + "letter ''", + "letter ''", + "letter ''", + "letter ''", + "letter ''", + "letter ''", + "letter ''", + "letter ''", /* 190 */ + "letter ''", + "letter ''", + "letter ''", + "letter ''", + "letter ''", + "letter ''", + "letter ''", + "letter ''", + "letter ''", + "growing wall (horizontally)", /* 200 */ "growing wall (vertically)", "growing wall (all directions)", "unused", @@ -409,7 +407,7 @@ char *element_info[] = "unused", "unused", "unused", - "empty space", + "empty space", /* 210 */ "zonk", "base", "murphy", @@ -419,7 +417,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)", @@ -429,7 +427,7 @@ char *element_info[] = "snik snak", "yellow disk", "terminal", - "red disk", + "red disk", /* 230 */ "port (vertically)", "port (horizontally)", "port (all directions)", @@ -439,7 +437,7 @@ char *element_info[] = "chip (right half)", "hardware", "hardware", - "hardware", + "hardware", /* 240 */ "hardware", "hardware", "hardware", @@ -449,12 +447,91 @@ 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", + "force field (passive)", + "extra time", + "switch gate (open)", + "switch gate (closed)", + "switch for switch gate", + "switch for switch gate", + "time gate", + "time gate with magic wheel", /* 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 */ + "force field (active, kills enemies)", + "-", + "-", + "-", + "-", + "-", + "-" + + /* + "-------------------------------", + */ }; int main(int argc, char *argv[])