etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-28 15:03:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix overflow, hex codes not working, and add dev prints

Browse source
This commit is contained in:
Agent X 2024-05-19 12:31:12 -04:00
parent 5fe4aeb605
commit e35e4529a2
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/game/player_palette.c
View file

@ -1,4 +1,5 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h>
#include "pc/ini.h" #include "pc/ini.h"
#include "pc/mods/mods.h" #include "pc/mods/mods.h"
#include "pc/mods/mods_utils.h" #include "pc/mods/mods_utils.h"
@ -43,13 +44,14 @@ void player_palettes_reset(void) {
static u8 read_value(const char* data) { static u8 read_value(const char* data) {
if (data == NULL) { return 0; } if (data == NULL) { return 0; }
data = sys_strlwr((char*)data);
for (size_t i = 0; i < strlen(data); i++) { for (size_t i = 0; i < strlen(data); i++) {
char c = data[i]; char c = data[i];
if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || c == 'x')) { if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || c == 'x')) {
return 0; return 0;
} }
} }
return strtol(data, NULL, 0); return MIN(strtol(data, NULL, 0), 255);
} }
void player_palettes_read(const char* palettesPath) { void player_palettes_read(const char* palettesPath) {
@ -82,7 +84,12 @@ void player_palettes_read(const char* palettesPath) {
} }
if (strlen(path) == 0) { continue; } if (strlen(path) == 0) { continue; }
if (!player_palette_init(palettesPath, path)) { continue; } if (!player_palette_init(palettesPath, path)) {
#ifdef DEVELOPMENT
printf("Failed to load palette '%s.ini'\n", path);
#endif
continue;
}
struct PlayerPalette palette = {{ struct PlayerPalette palette = {{
{ read_value(ini_get(sPalette, "PALETTE", "PANTS_R")), read_value(ini_get(sPalette, "PALETTE", "PANTS_G")), read_value(ini_get(sPalette, "PALETTE", "PANTS_B")) }, { read_value(ini_get(sPalette, "PALETTE", "PANTS_R")), read_value(ini_get(sPalette, "PALETTE", "PANTS_G")), read_value(ini_get(sPalette, "PALETTE", "PANTS_B")) },
@ -100,6 +107,9 @@ void player_palettes_read(const char* palettesPath) {
strncpy(gPresetPalettes[gPresetPaletteCount].name, path, 4096); strncpy(gPresetPalettes[gPresetPaletteCount].name, path, 4096);
gPresetPalettes[gPresetPaletteCount].palette = palette; gPresetPalettes[gPresetPaletteCount].palette = palette;
gPresetPaletteCount++; gPresetPaletteCount++;
#ifdef DEVELOPMENT
printf("Loaded palette '%s.ini'\n", path);
#endif
if (gPresetPaletteCount >= MAX_PRESET_PALETTES) { break; } if (gPresetPaletteCount >= MAX_PRESET_PALETTES) { break; }
} }