X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=f6e10265b6e5387dde3f85f6a0d233debf7bbaed;hb=c4e1a476135ce36417cdd797481feeaaff4301af;hp=c75171ba1306cd893467e33428f739e204f7a2ce;hpb=adaabca253f2e76597725cdc86fc1fff6f0de1d2;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index c75171ba..f6e10265 100644 --- a/src/game.c +++ b/src/game.c @@ -1,23 +1,22 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2000 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* game.c * +* game.c * ***********************************************************/ +#include "libgame/libgame.h" + #include "game.h" -#include "misc.h" #include "tools.h" #include "screens.h" -#include "sound.h" #include "init.h" -#include "buttons.h" #include "files.h" #include "tape.h" #include "joystick.h" @@ -167,17 +166,21 @@ static unsigned int getStateCheckSum(int counter) void GetPlayerConfig() { - if (sound_status == SOUND_OFF) + if (!audio.sound_available) setup.sound = FALSE; - if (!sound_loops_allowed) + if (!audio.loops_available) { setup.sound_loops = FALSE; setup.sound_music = FALSE; } + if (!video.fullscreen_available) + setup.fullscreen = FALSE; + setup.sound_simple = setup.sound; + SetAudioMode(setup.sound); InitJoysticks(); } @@ -229,8 +232,17 @@ static void InitField(int x, int y, boolean init_game) { switch (Feld[x][y]) { - case EL_SPIELFIGUR: case EL_SP_MURPHY: + if (init_game) + { + if (stored_player[0].present) + { + Feld[x][y] = EL_SP_MURPHY_CLONE; + break; + } + } + /* no break! */ + case EL_SPIELFIGUR: if (init_game) Feld[x][y] = EL_SPIELER1; /* no break! */ @@ -493,7 +505,7 @@ void InitGame() network_player_action_received = FALSE; -#ifndef MSDOS +#if defined(PLATFORM_UNIX) /* initial null action */ if (network_playing) SendToServer_MovePlayer(MV_NO_MOVING); @@ -501,7 +513,6 @@ void InitGame() ZX = ZY = -1; - game.yam_content_nr = 0; FrameCounter = 0; TimeFrames = 0; TimePlayed = 0; @@ -514,6 +525,8 @@ void InitGame() ScrollStepSize = 0; /* will be correctly initialized by ScrollScreen() */ AllPlayersGone = FALSE; + + game.yam_content_nr = 0; game.magic_wall_active = FALSE; game.magic_wall_time_left = 0; game.light_time_left = 0; @@ -700,32 +713,30 @@ void InitGame() DrawAllPlayers(); FadeToFront(); - /* after drawing the level, corect some elements */ - + /* after drawing the level, correct some elements */ if (game.timegate_time_left == 0) CloseAllOpenTimegates(); if (setup.soft_scrolling) - XCopyArea(display, fieldbuffer, backbuffer, gc, - FX, FY, SXSIZE, SYSIZE, SX, SY); + BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); redraw_mask |= REDRAW_FROM_BACKBUFFER; /* copy default game door content to main double buffer */ - XCopyArea(display, pix[PIX_DOOR], drawto, gc, - DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY); + BlitBitmap(pix[PIX_DOOR], drawto, + DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY); if (level_nr < 100) DrawText(DX + XX_LEVEL, DY + YY_LEVEL, int2str(level_nr, 2), FS_SMALL, FC_YELLOW); else { - DrawTextExt(drawto, gc, DX + XX_EMERALDS, DY + YY_EMERALDS, + DrawTextExt(drawto, DX + XX_EMERALDS, DY + YY_EMERALDS, int2str(level_nr, 3), FS_SMALL, FC_SPECIAL3); - XCopyArea(display, drawto, drawto, gc, - DX + XX_EMERALDS, DY + YY_EMERALDS + 1, - FONT5_XSIZE * 3, FONT5_YSIZE - 1, - DX + XX_LEVEL - 1, DY + YY_LEVEL + 1); + BlitBitmap(drawto, drawto, + DX + XX_EMERALDS, DY + YY_EMERALDS + 1, + FONT5_XSIZE * 3, FONT5_YSIZE - 1, + DX + XX_LEVEL - 1, DY + YY_LEVEL + 1); } DrawText(DX + XX_EMERALDS, DY + YY_EMERALDS, @@ -745,15 +756,15 @@ void InitGame() MapTapeButtons(); /* copy actual game door content to door double buffer for OpenDoor() */ - XCopyArea(display, drawto, pix[PIX_DB_DOOR], gc, - DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); + BlitBitmap(drawto, pix[PIX_DB_DOOR], + DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); OpenDoor(DOOR_OPEN_ALL); - if (setup.sound_music) - PlaySoundLoop(background_loop[level_nr % num_bg_loops]); + if (setup.sound_music && num_bg_loops) + PlayMusic(level_nr % num_bg_loops); - XAutoRepeatOff(display); + KeyboardAutoRepeatOff(); if (options.verbose) { @@ -1160,8 +1171,8 @@ void RemoveMovingField(int x, int y) if (Feld[x][y] == EL_BLOCKED && (Store[oldx][oldy] == EL_MORAST_LEER || - Store[oldx][oldy] == EL_SIEB_LEER || - Store[oldx][oldy] == EL_SIEB2_LEER || + Store[oldx][oldy] == EL_MAGIC_WALL_EMPTY || + Store[oldx][oldy] == EL_MAGIC_WALL_BD_EMPTY || Store[oldx][oldy] == EL_AMOEBE_NASS)) { Feld[oldx][oldy] = Store[oldx][oldy]; @@ -1804,11 +1815,12 @@ void Impact(int x, int y) if (!lastline && object_hit) /* check which object was hit */ { if (CAN_CHANGE(element) && - (smashed == EL_SIEB_INAKTIV || smashed == EL_SIEB2_INAKTIV)) + (smashed == EL_MAGIC_WALL_OFF || smashed == EL_MAGIC_WALL_BD_OFF)) { int x, y; int activated_magic_wall = - (smashed == EL_SIEB_INAKTIV ? EL_SIEB_LEER : EL_SIEB2_LEER); + (smashed == EL_MAGIC_WALL_OFF ? EL_MAGIC_WALL_EMPTY : + EL_MAGIC_WALL_BD_EMPTY); /* activate magic wall / mill */ @@ -1898,7 +1910,8 @@ void Impact(int x, int y) /* play sound of magic wall / mill */ if (!lastline && - (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER)) + (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY || + Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY)) { PlaySoundLevel(x, y, SND_QUIRK); return; @@ -2440,15 +2453,15 @@ void StartMoving(int x, int y) InitMovingField(x, y, MV_DOWN); Store[x][y] = EL_MORAST_VOLL; } - else if (element == EL_SIEB_VOLL) + else if (element == EL_MAGIC_WALL_FULL) { if (IS_FREE(x, y+1)) { InitMovingField(x, y, MV_DOWN); Feld[x][y] = EL_CHANGED(Store2[x][y]); - Store[x][y] = EL_SIEB_LEER; + Store[x][y] = EL_MAGIC_WALL_EMPTY; } - else if (Feld[x][y+1] == EL_SIEB_LEER) + else if (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY) { if (!MovDelay[x][y]) MovDelay[x][y] = TILEY/4 + 1; @@ -2460,21 +2473,21 @@ void StartMoving(int x, int y) return; } - Feld[x][y] = EL_SIEB_LEER; - Feld[x][y+1] = EL_SIEB_VOLL; + Feld[x][y] = EL_MAGIC_WALL_EMPTY; + Feld[x][y+1] = EL_MAGIC_WALL_FULL; Store2[x][y+1] = EL_CHANGED(Store2[x][y]); Store2[x][y] = 0; } } - else if (element == EL_SIEB2_VOLL) + else if (element == EL_MAGIC_WALL_BD_FULL) { if (IS_FREE(x, y+1)) { InitMovingField(x, y, MV_DOWN); Feld[x][y] = EL_CHANGED2(Store2[x][y]); - Store[x][y] = EL_SIEB2_LEER; + Store[x][y] = EL_MAGIC_WALL_BD_EMPTY; } - else if (Feld[x][y+1] == EL_SIEB2_LEER) + else if (Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY) { if (!MovDelay[x][y]) MovDelay[x][y] = TILEY/4 + 1; @@ -2486,18 +2499,20 @@ void StartMoving(int x, int y) return; } - Feld[x][y] = EL_SIEB2_LEER; - Feld[x][y+1] = EL_SIEB2_VOLL; + Feld[x][y] = EL_MAGIC_WALL_BD_EMPTY; + Feld[x][y+1] = EL_MAGIC_WALL_BD_FULL; Store2[x][y+1] = EL_CHANGED2(Store2[x][y]); Store2[x][y] = 0; } } else if (CAN_CHANGE(element) && - (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER)) + (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY || + Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY)) { InitMovingField(x, y, MV_DOWN); Store[x][y] = - (Feld[x][y+1] == EL_SIEB_LEER ? EL_SIEB_VOLL : EL_SIEB2_VOLL); + (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ? EL_MAGIC_WALL_FULL : + EL_MAGIC_WALL_BD_FULL); Store2[x][y+1] = element; } else if (CAN_SMASH(element) && Feld[x][y+1] == EL_SALZSAEURE) @@ -2941,27 +2956,30 @@ void ContinueMoving(int x, int y) Store[x][y] = 0; Feld[x][y] = EL_MORAST_LEER; } - else if (Store[x][y] == EL_SIEB_VOLL) + else if (Store[x][y] == EL_MAGIC_WALL_FULL) { Store[x][y] = 0; element = Feld[newx][newy] = - (game.magic_wall_active ? EL_SIEB_VOLL : EL_SIEB_TOT); + (game.magic_wall_active ? EL_MAGIC_WALL_FULL : EL_MAGIC_WALL_DEAD); } - else if (Store[x][y] == EL_SIEB_LEER) + else if (Store[x][y] == EL_MAGIC_WALL_EMPTY) { Store[x][y] = Store2[x][y] = 0; - Feld[x][y] = (game.magic_wall_active ? EL_SIEB_LEER : EL_SIEB_TOT); + Feld[x][y] = (game.magic_wall_active ? EL_MAGIC_WALL_EMPTY : + EL_MAGIC_WALL_DEAD); } - else if (Store[x][y] == EL_SIEB2_VOLL) + else if (Store[x][y] == EL_MAGIC_WALL_BD_FULL) { Store[x][y] = 0; element = Feld[newx][newy] = - (game.magic_wall_active ? EL_SIEB2_VOLL : EL_SIEB2_TOT); + (game.magic_wall_active ? EL_MAGIC_WALL_BD_FULL : + EL_MAGIC_WALL_BD_DEAD); } - else if (Store[x][y] == EL_SIEB2_LEER) + else if (Store[x][y] == EL_MAGIC_WALL_BD_EMPTY) { Store[x][y] = Store2[x][y] = 0; - Feld[x][y] = (game.magic_wall_active ? EL_SIEB2_LEER : EL_SIEB2_TOT); + Feld[x][y] = (game.magic_wall_active ? EL_MAGIC_WALL_BD_EMPTY : + EL_MAGIC_WALL_BD_DEAD); } else if (Store[x][y] == EL_SALZSAEURE) { @@ -3575,7 +3593,7 @@ void BreakingPearl(int x, int y) void SiebAktivieren(int x, int y, int typ) { - int graphic = (typ == 1 ? GFX_SIEB_VOLL : GFX_SIEB2_VOLL) + 3; + int graphic = (typ == 1 ? GFX_MAGIC_WALL_FULL : GFX_MAGIC_WALL_BD_FULL) + 3; DrawGraphicAnimation(x, y, graphic, 4, 4, ANIM_REVERSE); } @@ -3777,8 +3795,8 @@ void EdelsteinFunkeln(int x, int y) dest_x = FX + SCREENX(x)*TILEX; dest_y = FY + SCREENY(y)*TILEY; - XCopyArea(display, drawto_field, window, gc, - dest_x, dest_y, TILEX, TILEY, dest_x, dest_y); + BlitBitmap(drawto_field, window, + dest_x, dest_y, TILEX, TILEY, dest_x, dest_y); SetDrawtoField(DRAW_DIRECT); } } @@ -4225,7 +4243,7 @@ void GameActions() #endif */ -#ifndef MSDOS +#if defined(PLATFORM_UNIX) /* last chance to get network player actions without main loop delay */ HandleNetworking(); #endif @@ -4262,7 +4280,7 @@ void GameActions() stored_player[i].effective_action = stored_player[i].action; } -#ifndef MSDOS +#if defined(PLATFORM_UNIX) if (network_playing) SendToServer_MovePlayer(summarized_player_action); #endif @@ -4422,14 +4440,15 @@ void GameActions() boolean sieb = FALSE; int jx = local_player->jx, jy = local_player->jy; - if (element == EL_SIEB_LEER || element == EL_SIEB_VOLL || - Store[x][y] == EL_SIEB_LEER) + if (element == EL_MAGIC_WALL_EMPTY || element == EL_MAGIC_WALL_FULL || + Store[x][y] == EL_MAGIC_WALL_EMPTY) { SiebAktivieren(x, y, 1); sieb = TRUE; } - else if (element == EL_SIEB2_LEER || element == EL_SIEB2_VOLL || - Store[x][y] == EL_SIEB2_LEER) + else if (element == EL_MAGIC_WALL_BD_EMPTY || + element == EL_MAGIC_WALL_BD_FULL || + Store[x][y] == EL_MAGIC_WALL_BD_EMPTY) { SiebAktivieren(x, y, 2); sieb = TRUE; @@ -4458,14 +4477,15 @@ void GameActions() { element = Feld[x][y]; - if (element == EL_SIEB_LEER || element == EL_SIEB_VOLL) + if (element == EL_MAGIC_WALL_EMPTY || element == EL_MAGIC_WALL_FULL) { - Feld[x][y] = EL_SIEB_TOT; + Feld[x][y] = EL_MAGIC_WALL_DEAD; DrawLevelField(x, y); } - else if (element == EL_SIEB2_LEER || element == EL_SIEB2_VOLL) + else if (element == EL_MAGIC_WALL_BD_EMPTY || + element == EL_MAGIC_WALL_BD_FULL) { - Feld[x][y] = EL_SIEB2_TOT; + Feld[x][y] = EL_MAGIC_WALL_BD_DEAD; DrawLevelField(x, y); } } @@ -4543,6 +4563,25 @@ void GameActions() } DrawAllPlayers(); + + if (options.debug) /* calculate frames per second */ + { + static unsigned long fps_counter = 0; + static int fps_frames = 0; + unsigned long fps_delay_ms = Counter() - fps_counter; + + fps_frames++; + + if (fps_delay_ms >= 500) /* calculate fps every 0.5 seconds */ + { + global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms; + + fps_frames = 0; + fps_counter = Counter(); + } + + redraw_mask |= REDRAW_FPS; + } } static boolean AllPlayersInSight(struct PlayerInfo *player, int x, int y) @@ -4589,13 +4628,13 @@ void ScrollLevel(int dx, int dy) int softscroll_offset = (setup.soft_scrolling ? TILEX : 0); int x, y; - XCopyArea(display, drawto_field, drawto_field, gc, - FX + TILEX*(dx == -1) - softscroll_offset, - FY + TILEY*(dy == -1) - softscroll_offset, - SXSIZE - TILEX*(dx!=0) + 2*softscroll_offset, - SYSIZE - TILEY*(dy!=0) + 2*softscroll_offset, - FX + TILEX*(dx == 1) - softscroll_offset, - FY + TILEY*(dy == 1) - softscroll_offset); + BlitBitmap(drawto_field, drawto_field, + FX + TILEX*(dx == -1) - softscroll_offset, + FY + TILEY*(dy == -1) - softscroll_offset, + SXSIZE - TILEX*(dx!=0) + 2*softscroll_offset, + SYSIZE - TILEY*(dy!=0) + 2*softscroll_offset, + FX + TILEX*(dx == 1) - softscroll_offset, + FY + TILEY*(dy == 1) - softscroll_offset); if (dx) { @@ -5364,12 +5403,10 @@ int DigField(struct PlayerInfo *player, RemoveField(x, y); player->key[key_nr] = TRUE; RaiseScoreElement(EL_SCHLUESSEL); - DrawMiniGraphicExt(drawto, gc, - DX_KEYS+key_nr*MINI_TILEX, DY_KEYS, - GFX_SCHLUESSEL1+key_nr); - DrawMiniGraphicExt(window, gc, - DX_KEYS+key_nr*MINI_TILEX, DY_KEYS, - GFX_SCHLUESSEL1+key_nr); + DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, + GFX_SCHLUESSEL1 + key_nr); + DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, + GFX_SCHLUESSEL1 + key_nr); PlaySoundLevel(x, y, SND_PONG); break; } @@ -5384,12 +5421,10 @@ int DigField(struct PlayerInfo *player, RemoveField(x, y); player->key[key_nr] = TRUE; RaiseScoreElement(EL_SCHLUESSEL); - DrawMiniGraphicExt(drawto, gc, - DX_KEYS+key_nr*MINI_TILEX, DY_KEYS, - GFX_SCHLUESSEL1+key_nr); - DrawMiniGraphicExt(window, gc, - DX_KEYS+key_nr*MINI_TILEX, DY_KEYS, - GFX_SCHLUESSEL1+key_nr); + DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, + GFX_SCHLUESSEL1 + key_nr); + DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, + GFX_SCHLUESSEL1 + key_nr); PlaySoundLevel(x, y, SND_PONG); break; } @@ -5911,7 +5946,7 @@ void PlaySoundLevel(int x, int y, int sound_nr) volume = PSND_MAX_VOLUME; -#ifndef MSDOS +#if !defined(PLATFORM_MSDOS) stereo = (sx - SCR_FIELDX/2) * 12; #else stereo = PSND_MIDDLE + (2 * sx - (SCR_FIELDX - 1)) * 5; @@ -6047,7 +6082,7 @@ void CreateGameButtons() for (i=0; i