X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=302b5418e8d7e87878eb8c1948dd8e9de23d5742;hb=4b0c6356359ee52f98cee8fa578179c6c41d4ef1;hp=bd5edbb835348ffe059e15dc40f3d918ce8f37f7;hpb=5335fd9e893a7af87a72fb78609c2eb281bd7f63;p=rocksndiamonds.git diff --git a/src/main.c b/src/main.c index bd5edbb8..302b5418 100644 --- a/src/main.c +++ b/src/main.c @@ -14,11 +14,17 @@ #include "main.h" #include "init.h" +#include "game.h" #include "events.h" #include "sound.h" #include "joystick.h" +#ifdef MSDOS +#include +#endif + Display *display; +Visual *visual; int screen; Window window; GC gc, clip_gc[NUM_PIXMAPS]; @@ -82,14 +88,16 @@ long Elementeigenschaften[MAX_ELEMENTS]; int level_nr, leveldir_nr, num_leveldirs; int lev_fieldx,lev_fieldy, scroll_x,scroll_y; -int FX = SX, FY = SY, ScreenMovPos = 0; +int FX = SX, FY = SY, ScreenMovPos = 0, ScrollStepSize = TILEX/8; +int GameSpeed = GAME_FRAME_DELAY, MoveSpeed = 8; int BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1; int JX,JY, lastJX,lastJY, ZX,ZY, ExitX,ExitY; -int PlayerMovDir, PlayerMovPos, PlayerFrame, PlayerPushing; -int PlayerGone,LevelSolved,GameOver; -int FrameCounter,TimeFrames,TimeLeft,Score; -int Gems,SokobanFields,Lights,Friends; -int Dynamite,Key[4],MampferNr; +int PlayerMovDir, PlayerMovPos, PlayerPushing; +int PlayerFrame, PlayerGfxPos; +int PlayerGone, LevelSolved, GameOver; +int FrameCounter, TimeFrames, TimeLeft, Score; +int Gems, SokobanFields, Lights, Friends; +int Dynamite, Key[4], MampferNr; int DynaBombCount, DynaBombSize, DynaBombsLeft, DynaBombXL; int SiebAktiv; @@ -187,6 +195,10 @@ int main(int argc, char *argv[]) if (argc>1) level_directory = argv[1]; +#ifdef MSDOS + _fmode = O_BINARY; +#endif + OpenAll(argc,argv); EventLoop(); CloseAll();