Fix rebase errors.

DescentDevelopers · May 5, 2024 · bd29b38 · bd29b38
1 parent 6a9d6e7
commit bd29b38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Descent3/hotspotmap.cpp b/Descent3/hotspotmap.cpp
@@ -115,8 +115,8 @@
 #include "manage.h"
 
 static void makecorner(int corner_bmp, int back_bmp, const char *tmap, int l, int t, int r, int b);
-static int CreateHotSpotMap(char *map, int width, int height, hotspotmap_t *hsmap);
-static void CreateWindowMap(char *map, int width, int height, windowmap_t *wndmap);
+static int CreateHotSpotMap(const char *map, int width, int height, hotspotmap_t *hsmap);
+static void CreateWindowMap(const char *map, int width, int height, windowmap_t *wndmap);
 
 // just like the old bm_tga_translate_pixel function, but it stores the alpha in the alpha_value parameter
 ushort menutga_translate_pixel(int pixel, char *alpha_value) {

diff --git a/netgames/anarchy/anarchy.cpp b/netgames/anarchy/anarchy.cpp
@@ -81,7 +81,7 @@ static void DisplayWelcomeMessage(int player_num);
 static void SaveStatsToFile(char *filename);
 static void SwitchHUDColor(int i);
 static void SwitchAnarchyScores(int i);
-static char *GetString(int d);
+static const char *GetString(int d);
 static void DetermineScore(int precord_num, int column_num, char *buffer, int buffer_size);
 
 ///////////////////////////////////////////////