mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 03:30:32 -04:00
47 lines
2.1 KiB
C
47 lines
2.1 KiB
C
--- seg009.c.orig 2021-07-06 13:10:16 UTC
|
|
+++ seg009.c
|
|
@@ -343,7 +343,7 @@ static FILE* open_dat_from_root_or_data_dir(const char
|
|
// if failed, try if the DAT file can be opened in the data/ directory, instead of the main folder
|
|
if (fp == NULL) {
|
|
char data_path[POP_MAX_PATH];
|
|
- snprintf_check(data_path, sizeof(data_path), "data/%s", filename);
|
|
+ snprintf_check(data_path, sizeof(data_path), "%%DATADIR%%/%s", filename);
|
|
|
|
if (!file_exists(data_path)) {
|
|
find_exe_dir();
|
|
@@ -2078,7 +2078,7 @@ const int sound_channel = 0;
|
|
const int max_sound_id = 58;
|
|
|
|
void load_sound_names() {
|
|
- const char* names_path = locate_file("data/music/names.txt");
|
|
+ const char* names_path = locate_file("%%DATADIR%%/music/names.txt");
|
|
if (sound_names != NULL) return;
|
|
FILE* fp = fopen(names_path,"rt");
|
|
if (fp==NULL) return;
|
|
@@ -2128,7 +2128,7 @@ sound_buffer_type* load_sound(int index) {
|
|
fp = fopen(filename, "rb");
|
|
}
|
|
if (fp == NULL && !skip_normal_data_files) {
|
|
- snprintf_check(filename, sizeof(filename), "data/music/%s.ogg", sound_name(index));
|
|
+ snprintf_check(filename, sizeof(filename), "%%DATADIR%%/music/%s.ogg", sound_name(index));
|
|
fp = fopen(locate_file(filename), "rb");
|
|
}
|
|
if (fp == NULL) {
|
|
@@ -2495,7 +2495,7 @@ void __pascal far set_gr_mode(byte grmode) {
|
|
#endif
|
|
}
|
|
|
|
- SDL_Surface* icon = IMG_Load(locate_file("data/icon.png"));
|
|
+ SDL_Surface* icon = IMG_Load(locate_file("%%DATADIR%%/icon.png"));
|
|
if (icon == NULL) {
|
|
sdlperror("set_gr_mode: Could not load icon");
|
|
} else {
|
|
@@ -2754,7 +2754,7 @@ void load_from_opendats_metadata(int resource_id, cons
|
|
if (len >= 5 && filename_no_ext[len-4] == '.') {
|
|
filename_no_ext[len-4] = '\0'; // terminate, so ".DAT" is deleted from the filename
|
|
}
|
|
- snprintf_check(image_filename,sizeof(image_filename),"data/%s/res%d.%s",filename_no_ext, resource_id, extension);
|
|
+ snprintf_check(image_filename,sizeof(image_filename),"%%DATADIR%%/%s/res%d.%s",filename_no_ext, resource_id, extension);
|
|
if (!use_custom_levelset) {
|
|
//printf("loading (binary) %s",image_filename);
|
|
fp = fopen(locate_file(image_filename), "rb");
|