game/hurrican/hurrican-src-svn281-aros.diff

   1 diff -ruN hurrican-src-svn281/src/Main.cpp hurrican-src-svn281.aros/src/Main.cpp
   2 --- hurrican-src-svn281/src/Main.cpp    2016-04-01 20:15:33.596920000 +0100
   3 +++ hurrican-src-svn281.aros/src/Main.cpp       2017-04-14 18:48:24.622908718 +0100
   4 @@ -657,7 +657,11 @@
   5  #else // NON-ANDROID:
   6  #ifdef USE_HOME_DIR
   7      // Makefile is specifying this is a UNIX machine and we should write saves,settings,etc to $HOME/.hurrican/ dir
   8 +#ifdef __AROS__
   9 +        char *homedir = "/PROGDIR";
  10 +#else
  11          char *homedir = getenv("HOME");
  12 +#endif
  13          bool success = false;
  14          if (homedir) {
  15              const char *subdir = "/.hurrican";
  16 diff -ruN hurrican-src-svn281/src/SDLPort/SDL_fmod.cpp hurrican-src-svn281.aros/src/SDLPort/SDL_fmod.cpp
  17 --- hurrican-src-svn281/src/SDLPort/SDL_fmod.cpp        2015-11-03 12:00:19.242492000 +0000
  18 +++ hurrican-src-svn281.aros/src/SDLPort/SDL_fmod.cpp   2017-04-14 19:14:46.184108518 +0100
  19 @@ -353,8 +353,13 @@
  20      if ((inputmode & FSOUND_LOADMEMORY) == FSOUND_LOADMEMORY)
  21      {
  22  #if 1
  23 +#ifdef __AROS__
  24 +        SDL_RWops* sdl_rw = SDL_RWFromMem( (void*)filename, length );
  25 +               chunk = Mix_LoadWAV_RW(sdl_rw, 1);
  26 +#else
  27          SDL_RWops* sdl_rw = SDL_RWFromConstMem( (const void*)filename, length );
  28                 chunk = Mix_LoadWAV_RW(sdl_rw, 1);
  29 +#endif
  30  #else
  31          chunk = Mix_QuickLoad_WAV( (Uint8*)filename );
  32  #endif
  33 diff -ruN hurrican-src-svn281/src/SDLPort/SDL_port.h hurrican-src-svn281.aros/src/SDLPort/SDL_port.h
  34 --- hurrican-src-svn281/src/SDLPort/SDL_port.h  2015-10-12 23:20:09.353457000 +0100
  35 +++ hurrican-src-svn281.aros/src/SDLPort/SDL_port.h     2017-04-14 18:48:24.623908728 +0100
  36 @@ -42,11 +42,13 @@
  37
  38  #define CONST       const
  39  #ifndef __WIN32__
  40 +#ifndef __AROS__
  41  #define FALSE       false
  42  #define TRUE        true
  43  typedef bool        BOOL;
  44  typedef float       FLOAT;
  45  typedef int32_t     LONG;
  46 +#endif
  47  typedef uint32_t    DWORD, UINT;
  48  typedef char*       LPSTR;
  49  typedef const char* LPCTSTR;
  50 diff -ruN hurrican-src-svn281/src/SDLPort/texture.cpp hurrican-src-svn281.aros/src/SDLPort/texture.cpp
  51 --- hurrican-src-svn281/src/SDLPort/texture.cpp 2015-11-08 23:44:22.180351000 +0000
  52 +++ hurrican-src-svn281.aros/src/SDLPort/texture.cpp    2017-04-14 19:16:25.869105053 +0100
  53 @@ -364,8 +364,11 @@
  54          rawSurf = IMG_Load(fullpath.c_str());
  55      } else              // Load from memory
  56      {
  57 +#ifdef __AROS__
  58 +        SDL_RWops* sdl_rw = SDL_RWFromMem( (void*)buf, buf_size );
  59 +#else
  60          SDL_RWops* sdl_rw = SDL_RWFromConstMem( (const void*)buf, buf_size );
  61 -
  62 +#endif
  63          if (sdl_rw != NULL)
  64          {
  65              rawSurf = IMG_Load_RW( sdl_rw, 1 );