haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

pipepanic: move from games-kids to games-puzzle; minor changes. (#606)

Browse Source 
* Move pipepanic from games-kids to games-puzzle to follow Gentoo.
* Put pipepanic.rdef in additional-files instead of the patch file.
* Call addResourcesToBinaries instead of rc and xres.
* Reorder sections, fix COPYRIGHT, enable x86_64, drop cmd:xres from
  BUILD_REQUIRES, add cmd:{sdl_config,install,cut} to BUILD_PREREQ.
* Install README and do some polishing in BUILD and INSTALL.
This commit is contained in:
fbrosson
2016-05-24 21:57:57 +00:00
parent 5409cad381
commit 0c1be5b940
4 changed files with 101 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
games-puzzle/pipepanic/patches/pipepanic-0.1.3.patch Normal file
View File

@@ -0,0 +1,118 @@
diff --git a/main.c b/main.c
index 6cf114c..960f57a 100644
--- a/main.c
+++ b/main.c
@@ -16,6 +16,14 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Includes */
+// chdir()
+#include <unistd.h>
+#include <libgen.h>
+
+#ifdef __HAIKU__
+#include <FindDirectory.h>
+#endif
+
#include <SDL/SDL_main.h>
#include <SDL/SDL.h>
#include <string.h>
@@ -44,6 +52,10 @@ SDL_Surface *temp;
SDL_Event event;
char *current_dir;
char *user_home_dir;
+#ifdef __HAIKU__
+char user_settings_dir[256];
+#endif
+char save_file[256];
int quit = 0;
int game_mode = GAMEON;
int previous_game_mode = 0;
@@ -102,6 +114,9 @@ extern "C"
int main(int argc, char *argv[]) {
int count, count2;
+ // For tracker (Thanks PulkoMandy)
+ chdir(dirname(argv[0]));
+
/* Initialise the highscoreboard array because there may not yet
be a saved highscore[board]/rc file */
for (count = 0; count < 5; count++) {
@@ -114,7 +129,16 @@ int main(int argc, char *argv[]) {
current_dir = getenv("PWD");
user_home_dir = getenv("HOME");
-
+
+ #ifdef __HAIKU__
+ find_directory(B_USER_SETTINGS_DIRECTORY, NULL, true,
+ user_settings_dir, sizeof(user_settings_dir));
+ snprintf(save_file, sizeof(save_file),
+ "%s/" RESOURCEFILE, user_settings_dir);
+ #else
+ snprintf(save_file, sizeof(save_file),
+ "%s/" RESOURCEFILE, user_home_dir);
+ #endif
#ifdef DEBUG
printf("PWD=%s\n", current_dir);
printf("HOME=%s\n", user_home_dir);
@@ -1567,16 +1591,12 @@ void read_rc_file(void) {
FILE* file;
int result, value, count;
- strcpy(buffer, user_home_dir);
- strcat(buffer, "/");
- strcat(buffer, RESOURCEFILE);
-
#ifdef DEBUG
- printf("%s\n", buffer);
+ printf("%s\n", save_file);
#endif
- if ((file = fopen(buffer,"r")) == NULL) {
- printf("%s: Cannot read from file %s\n", __func__, buffer);
+ if ((file = fopen(save_file,"r")) == NULL) {
+ printf("%s: Cannot read from file %s\n", __func__, save_file);
return;
}
@@ -1638,20 +1658,15 @@ void read_rc_file(void) {
***************************************************************************/
void save_rc_file(void) {
- char buffer[256];
FILE* file;
int count;
- strcpy(buffer, user_home_dir);
- strcat(buffer, "/");
- strcat(buffer, RESOURCEFILE);
-
#ifdef DEBUG
- printf("%s\n", buffer);
+ printf("%s\n", save_file);
#endif
- if ((file = fopen(buffer,"w")) == NULL) {
- printf("%s: Cannot write to file %s\n", __func__, buffer);
+ if ((file = fopen(save_file,"w")) == NULL) {
+ printf("%s: Cannot write to file %s\n", __func__, save_file);
return;
}
diff --git a/main.h b/main.h
index 664b75b..178f665 100644
--- a/main.h
+++ b/main.h
@@ -27,7 +27,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define TILES48BMP "tiles48.bmp"
#define ASCII15BMP "ascii15.bmp"
#define ASCII30BMP "ascii30.bmp"
+#ifdef __HAIKU__
+#define RESOURCEFILE "pipepanic"
+#else
#define RESOURCEFILE ".pipepanicrc"
+#endif
#define MAGENTA 0xff, 0x00, 0xff
#define YELLOW 0xff, 0xcc, 0x66