Merge pull request #150 from TheFakeMontyOnTheRun/lots-of-improvements

Lots of improvements
TheFakeMontyOnTheRun · May 28, 2024 · c423067 · c423067
2 parents a90591d + 6e8306f
commit c423067
Show file tree

Hide file tree

Showing 290 changed files with 109,279 additions and 1,663 deletions.
diff --git a/.github/workflows/build-ia16.yml b/.github/workflows/build-ia16.yml
@@ -23,4 +23,4 @@ jobs:
     - uses: actions/upload-artifact@v2
       with:
          name: Derelict for MS-DOS on 8088 (CGA Graphics)
-         path: mz_frontend/derelict.com
+         path: my_frontend/derelict.com
diff --git a/.gitignore b/.gitignore
@@ -229,3 +229,14 @@ IDEWorkspaceChecks.plist
 gl_frontend/derelict.elf
 gl_frontend/derelict.nds
 filesystem
+distiller
+trigger
+derelict.tap
+newtrigger
+xcschememanagement.plist
+out.ram
+mx_frontend/index.data
+mx_frontend/index.html
+mx_frontend/index.js
+mx_frontend/index.wasm
+core/cmake-build-debug-coverage
diff --git a/art/newtitle.svg b/art/newtitle.svg
diff --git a/common/include/EDirection_Utils.h b/common/include/EDirection_Utils.h
@@ -7,6 +7,6 @@ enum EDirection rightOf(const enum EDirection d);
 
 struct Vec2i mapOffsetForDirection(const enum EDirection direction);
 
-int oppositeOf(int d);
+uint8_t oppositeOf(uint8_t d);
 
 #endif
diff --git a/common/include/Engine.h b/common/include/Engine.h
@@ -5,7 +5,7 @@ typedef void ( *InitStateCallback )(enum EGameMenuState tag);
 
 typedef void ( *RepaintCallback )(void);
 
-typedef enum EGameMenuState ( *TickCallback )(enum ECommand, long data);
+typedef enum EGameMenuState ( *TickCallback )(enum ECommand, void* data);
 
 typedef void ( *UnloadStateCallback )(enum EGameMenuState newState);
 
@@ -19,47 +19,47 @@ void MainMenu_initStateCallback(enum EGameMenuState tag);
 
 void MainMenu_repaintCallback(void);
 
-enum EGameMenuState MainMenu_tickCallback(enum ECommand, long data);
+enum EGameMenuState MainMenu_tickCallback(enum ECommand, void* data);
 
 void MainMenu_unloadStateCallback(enum EGameMenuState newState);
 
 void Crawler_initStateCallback(enum EGameMenuState tag);
 
 void Crawler_repaintCallback(void);
 
-enum EGameMenuState Crawler_tickCallback(enum ECommand, long data);
+enum EGameMenuState Crawler_tickCallback(enum ECommand, void* data);
 
 void Crawler_unloadStateCallback(enum EGameMenuState newState);
 
 void HelpScreen_initStateCallback(enum EGameMenuState tag);
 
 void HelpScreen_repaintCallback(void);
 
-enum EGameMenuState HelpScreen_tickCallback(enum ECommand, long data);
+enum EGameMenuState HelpScreen_tickCallback(enum ECommand, void* data);
 
 void HelpScreen_unloadStateCallback(enum EGameMenuState newState);
 
 void CreditsScreen_initStateCallback(enum EGameMenuState tag);
 
 void CreditsScreen_repaintCallback(void);
 
-enum EGameMenuState CreditsScreen_tickCallback(enum ECommand, long data);
+enum EGameMenuState CreditsScreen_tickCallback(enum ECommand, void* data);
 
 void CreditsScreen_unloadStateCallback(enum EGameMenuState newState);
 
 void GameMenu_initStateCallback(enum EGameMenuState tag);
 
 void GameMenu_repaintCallback(void);
 
-enum EGameMenuState GameMenu_tickCallback(enum ECommand, long data);
+enum EGameMenuState GameMenu_tickCallback(enum ECommand, void* data);
 
 void GameMenu_unloadStateCallback(enum EGameMenuState newState);
 
 void HackingScreen_initStateCallback(enum EGameMenuState tag);
 
 void HackingScreen_repaintCallback(void);
 
-enum EGameMenuState HackingScreen_tickCallback(enum ECommand, long data);
+enum EGameMenuState HackingScreen_tickCallback(enum ECommand, void* data);
 
 void HackingScreen_unloadStateCallback(enum EGameMenuState newState);
 

diff --git a/common/include/Enums.h b/common/include/Enums.h
@@ -47,7 +47,9 @@ enum EGameMenuState {
 #endif
     kBackToGame,
     kEndGame,
+#ifdef SUPPORTS_HACKING_MINIGAME
     kHackingGame,
+#endif
     kGoodVictoryEpilogue,
     kBadVictoryEpilogue,
     kGoodGameOverEpilogue,

diff --git a/common/include/FixP.h b/common/include/FixP.h
@@ -15,4 +15,8 @@ typedef int32_t FixP_t;
 
 #define fixToFloat(fp) (fixToInt(Mul((fp), intToFix(16))) / 16.0f)
 
+FixP_t lerpFix(const FixP_t v0, const FixP_t v1, const FixP_t t, const FixP_t total);
+
+int lerpInt(const int v0, const int v1, const long t, const long total);
+
 #endif
diff --git a/common/include/SoundSystem.h b/common/include/SoundSystem.h
@@ -5,7 +5,7 @@
 #ifndef SOUNDSYSTEM_H
 #define SOUNDSYSTEM_H
 
-void playSound(const int action);
+void playSound(const uint8_t action);
 
 void soundTick(void);
 

diff --git a/common/include/UI.h b/common/include/UI.h
@@ -43,4 +43,6 @@ extern int8_t cursorPosition;
 
 void clearScreen(void);
 
+void drawLine(uint16_t x0, uint8_t y0, uint16_t x1, uint8_t y1, uint8_t colour);
+
 #endif /*UI_H*/
diff --git a/common/src/AY-3-8910.c b/common/src/AY-3-8910.c
@@ -2,6 +2,7 @@
  * AY-3-8910: used on MSX, Amstrad CPC 464 and Atari ST
  * Created by Daniel Monteiro on 11/07/2023.
  * */
+#include <stdint.h>
 
 #include "AY-3-8910.h"
 
@@ -71,7 +72,7 @@ void soundTick(void) {
 }
 
 
-void playSound(int num) {
+void playSound(uint8_t num) {
     soundPos = 0;
     soundNum = 0;
 

diff --git a/common/src/CTile3DProperties.c b/common/src/CTile3DProperties.c
@@ -1,4 +1,4 @@
-#ifdef WIN32
+	#ifdef WIN32
 #include "Win32Int.h"
 #else
 
@@ -96,9 +96,9 @@ void loadPropertyList(const char *propertyFile, struct MapWithCharKey *map, stru
         struct Mesh* mesh;
         uint8_t len = *(bufferHead++);
 
-        char* meshName = allocMem(len + 1, GENERAL_MEMORY, 1);
+        char* meshName = (char*)allocMem(len + 1, GENERAL_MEMORY, 1);
         memcpy(meshName, bufferHead, len);
-        mesh = allocMem(sizeof(struct Mesh), GENERAL_MEMORY, 1);
+        mesh = (struct Mesh*)allocMem(sizeof(struct Mesh), GENERAL_MEMORY, 1);
         sprintf(&meshNameWithExtension[0], "%s.mdl", meshName);
         loadMesh(mesh, &meshNameWithExtension[0]);
         setInMap(meshes, kCustomMeshStart + c, mesh);