Merge branch 'master' of github.com:diasurgical/devilution into hellfire

.travis.yml

@@ -3,7 +3,7 @@ language: cpp
 os:
   - linux
   - osx
-  
+
 osx_image: xcode10.3
 
 notifications:
@@ -52,8 +52,7 @@ jobs:
           set -e
           wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.4.0/devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
           tar xf devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
-          rm comparer-config.toml
-          wget https://raw.githubusercontent.com/diasurgical/devilution-comparer/master/comparer-config.toml
+          mv comparer-config/diablo.toml comparer-config.toml
           echo '#!/bin/sh' | sudo tee /bin/wine
           echo 'docker run -v $(pwd):/root/devilution --entrypoint "/usr/bin/wine" diasurgical/riivaaja:stable $(basename $1) $2 $3' | sudo tee --append /bin/wine
           sudo chmod +x /bin/wine
@@ -73,8 +72,7 @@ jobs:
           set -e
           wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.4.0/devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
           tar xf devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
-          rm comparer-config.toml
-          wget https://raw.githubusercontent.com/diasurgical/devilution-comparer/master/shareware-comparer-config.toml -O comparer-config.toml
+          mv comparer-config/spawn.toml comparer-config.toml
           echo '#!/bin/sh' | sudo tee /bin/wine
           echo 'docker run -v $(pwd):/root/devilution --entrypoint "/usr/bin/wine" diasurgical/riivaaja:stable $(basename $1) $2 $3' | sudo tee --append /bin/wine
           sudo chmod +x /bin/wine
@@ -94,8 +92,7 @@ jobs:
           set -e
           wget https://github.com/diasurgical/devilution-comparer/releases/download/v0.4.0/devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
           tar xf devilution-comparer-v0.4.0-x86_64-unknown-linux-gnu.tar.xz
-          rm comparer-config.toml
-          wget https://raw.githubusercontent.com/diasurgical/devilution-comparer/master/hellfire-comparer-config.toml -O comparer-config.toml
+          mv comparer-config/hellfire.toml comparer-config.toml
           echo '#!/bin/sh' | sudo tee /bin/wine
           echo 'docker run -v $(pwd):/root/devilution --entrypoint "/usr/bin/wine" diasurgical/riivaaja:stable $(basename $1) $2 $3' | sudo tee --append /bin/wine
           sudo chmod +x /bin/wine

Source/scrollrt.h

@@ -20,37 +20,13 @@ void ClearCursor();
 void DrawMissile(int x, int y, int sx, int sy, int CelSkip, int capChunks, BOOL pre);
 void DrawClippedMissile(int x, int y, int sx, int sy, int CelSkip, int capChunks, BOOL pre);
 void DrawDeadPlayer(int x, int y, int sx, int sy, int CelSkip, int capChunks, BOOL clipped);
-void DrawPlayer(int pnum, int x, int y, int px, int py, BYTE *pCelBuff, int nCel, int nWidth, int CelSkip, int capChunks);
-void DrawClippedPlayer(int pnum, int x, int y, int px, int py, BYTE *pCelBuff, int nCel, int nWidth, int CelSkip, int capChunks);
 void DrawView(int StartX, int StartY);
-void DrawGame(int x, int y);
-void scrollrt_draw_lower(int x, int y, int sx, int sy, int chunks, int eflag);
-void scrollrt_draw_clipped_dungeon(BYTE *pBuff, int sx, int sy, int dx, int dy, int eflag);
-void DrawClippedMonster(int x, int y, int mx, int my, int m, int CelSkip, int capChunks);
-void DrawClippedObject(int x, int y, int ox, int oy, BOOL pre, int CelSkip, int capChunks);
-void scrollrt_draw_clipped_e_flag(BYTE *pBuff, int x, int y, int sx, int sy);
-void scrollrt_draw_lower_2(int x, int y, int sx, int sy, int chunks, int skipChunks, int eflag);
-void scrollrt_draw_clipped_dungeon_2(BYTE *pBuff, int sx, int sy, int skipChunks, int CelSkip, int dx, int dy, int eflag);
-void scrollrt_draw_clipped_e_flag_2(BYTE *pBuff, int x, int y, int skipChunks, int CelSkip, int sx, int sy);
-void scrollrt_draw_upper(int x, int y, int sx, int sy, int chunks, int capChunks, int eflag);
-void scrollrt_draw_dungeon(BYTE *pBuff, int sx, int sy, int capChunks, int CelCap, int dx, int dy, int eflag);
-void DrawMonster(int x, int y, int mx, int my, int m, int CelSkip, int CelCap);
-void DrawObject(int x, int y, int ox, int oy, BOOL pre, int CelSkip, int capChunks);
-void scrollrt_draw_e_flag(BYTE *pBuff, int x, int y, int capChunks, int CelCap, int sx, int sy);
-void DrawZoom(int x, int y);
 void ClearScreenBuffer();
 #ifdef _DEBUG
 void ScrollView();
 void EnableFrameCount();
 #endif
 void scrollrt_draw_game_screen(BOOL draw_cursor);
-void scrollrt_draw_cursor_back_buffer();
-void scrollrt_draw_cursor_item();
-void DrawMain(int dwHgt, BOOL draw_desc, BOOL draw_hp, BOOL draw_mana, BOOL draw_sbar, BOOL draw_btn);
-#ifdef _DEBUG
-void DrawFPS();
-#endif
-void DoBlitScreen(DWORD dwX, DWORD dwY, DWORD dwWdt, DWORD dwHgt);
 void DrawAndBlit();
 
 /* rdata */