mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-11 18:50:46 +00:00
- removed Android and Mapster headers plus raw EDuke assets in Blood folder.
This commit is contained in:
Christoph Oelckers
parent
ac8d31e39f
commit
71b332459b
30 changed files with 3 additions and 849 deletions
|
|
@ -30,11 +30,6 @@
|
|||
#include "mutex.h"
|
||||
#include "sdl_inc.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include "duke3d.h"
|
||||
#include "android.h"
|
||||
#endif
|
||||
|
||||
enum {
|
||||
SDLErr_Warning = -2,
|
||||
SDLErr_Error = -1,
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -38,10 +38,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "tile.h"
|
||||
#include "view.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
# include "android.h"
|
||||
#endif
|
||||
|
||||
#if defined RENDERTYPESDL && defined SDL_TARGET && SDL_TARGET > 1
|
||||
# include "sdl_inc.h"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
//-------------------------------------------------------------------------
|
||||
/*
|
||||
Copyright (C) 2010 EDuke32 developers and contributors
|
||||
|
||||
This file is part of EDuke32.
|
||||
|
||||
EDuke32 is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License version 2
|
||||
as published by the Free Software Foundation.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
#ifndef android_h_
|
||||
#define android_h_
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include "compat.h"
|
||||
#include "control.h"
|
||||
#include "in_android.h"
|
||||
|
||||
//extern int android_sample_rate;
|
||||
|
||||
//extern int android_audio_buffer_size;
|
||||
|
||||
|
||||
extern void CONTROL_Android_ClearButton(int32_t whichbutton);
|
||||
extern void CONTROL_Android_PollDevices(ControlInfo *info);
|
||||
extern void CONTROL_Android_SetLastWeapon(int w);
|
||||
|
||||
extern void CONTROL_Android_ScrollMap(int32_t *angle,int32_t *x, int32_t *y, uint16_t *zoom );
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
@ -28,10 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
|
||||
#include "vfs.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
# include "android.h"
|
||||
#endif
|
||||
|
||||
#if defined RENDERTYPESDL && defined SDL_TARGET && SDL_TARGET > 1
|
||||
# include "sdl_inc.h"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -41,14 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "cmdline.h"
|
||||
#include "palette.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include "android.h"
|
||||
#endif
|
||||
|
||||
#ifdef LUNATIC
|
||||
# include "lunatic_game.h"
|
||||
#endif
|
||||
|
||||
#include "vfs.h"
|
||||
|
||||
// Uncomment to prevent anything except mirrors from drawing. It is sensible to
|
||||
|
|
|
|||
|
|
@ -1,120 +0,0 @@
|
|||
#include "function.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
#define MENU_UP 0x200
|
||||
#define MENU_DOWN 0x201
|
||||
#define MENU_LEFT 0x202
|
||||
#define MENU_RIGHT 0x203
|
||||
#define MENU_SELECT 0x204
|
||||
#define MENU_BACK 0x205
|
||||
|
||||
#define KEY_QUICK_CMD 0x1005
|
||||
#define KEY_SHOW_KBRD 0x1008
|
||||
#define KEY_SHOW_INVEN 0x1009
|
||||
#define KEY_QUICK_SAVE 0x100A
|
||||
#define KEY_QUICK_LOAD 0x100B
|
||||
|
||||
#define KEY_QUICK_KEY1 0x1011
|
||||
#define KEY_QUICK_KEY2 0x1012
|
||||
#define KEY_QUICK_KEY3 0x1013
|
||||
#define KEY_QUICK_KEY4 0x1014
|
||||
|
||||
// #define BUTTONSET(x,value) (CONTROL_ButtonState |= ((uint64_t)value<<((uint64_t)(x))))
|
||||
// #define BUTTONCLEAR(x) (CONTROL_ButtonState &= ~((uint64_t)1<<((uint64_t)(x))))
|
||||
|
||||
#define PRECISIONSHOOTFACTOR 0.3f
|
||||
|
||||
// where do these numbers come from?
|
||||
#define ANDROIDMOVEFACTOR 6400
|
||||
#define ANDROIDLOOKFACTOR 1600
|
||||
|
||||
#define ANDROIDPITCHFACTORJOYSTICK 2000
|
||||
#define ANDROIDYAWFACTORJOYSTICK 4000
|
||||
|
||||
typedef enum {
|
||||
R_TOUCH_MODE,
|
||||
R_PLAYER_GOTWEAPON,
|
||||
R_UD_OVERHEAD_ON,
|
||||
R_UD_SCROLLMODE,
|
||||
R_PLAYER_LASTWEAPON,
|
||||
R_GAME_PAUSED,
|
||||
R_PLAYER_DEAD_FLAG,
|
||||
R_PLAYER_INV_AMOUNT,
|
||||
R_SOMETHINGONPLAYER
|
||||
} portableread_t;
|
||||
|
||||
|
||||
typedef enum {
|
||||
TOUCH_SCREEN_BLANK, //Nothing on screen (not used)
|
||||
TOUCH_SCREEN_BLANK_TAP, //One button filling screen with no graphic, tap to send Enter key
|
||||
TOUCH_SCREEN_YES_NO, //Yes/No buttons on screen, sends Enter or Esc
|
||||
TOUCH_SCREEN_MENU, //Normal menu
|
||||
TOUCH_SCREEN_MENU_NOBACK, // menu without back button
|
||||
TOUCH_SCREEN_GAME, //Normal game screen
|
||||
TOUCH_SCREEN_AUTOMAP, //When auto map is up (not used yet)
|
||||
TOUCH_SCREEN_CONSOLE //When Console is up
|
||||
} touchscreemode_t;
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int32_t crouchToggleState;
|
||||
int32_t lastWeapon;
|
||||
int32_t toggleCrouch;
|
||||
int32_t quickSelectWeapon;
|
||||
|
||||
uint64_t functionSticky; //To let at least one tick
|
||||
uint64_t functionHeld;
|
||||
|
||||
int32_t left_double_action;
|
||||
int32_t right_double_action;
|
||||
|
||||
int32_t invertLook, hideStick;
|
||||
|
||||
double pitch, yaw;
|
||||
double pitch_joystick, yaw_joystick;
|
||||
float forwardmove, sidemove;
|
||||
|
||||
// set by configuration UI
|
||||
float strafe_sens, forward_sens;
|
||||
float pitch_sens, yaw_sens;
|
||||
|
||||
float gameControlsAlpha;
|
||||
} droidinput_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int32_t audio_sample_rate;
|
||||
int32_t audio_buffer_size;
|
||||
uint16_t screen_width, screen_height;
|
||||
} droidsysinfo_t;
|
||||
|
||||
extern droidinput_t droidinput;
|
||||
extern droidsysinfo_t droidinfo;
|
||||
|
||||
void AndroidTimer(int tics);
|
||||
int AndroidKeyEvent(int state, int code, int unicode);
|
||||
int AndroidRead(portableread_t r);
|
||||
|
||||
void AndroidAction(int state, int action);
|
||||
|
||||
void AndroidMouseMenu(float x,float y);
|
||||
void AndroidMouseMenuButton(int state,int button);
|
||||
|
||||
void AndroidMove(float fwd, float strafe);
|
||||
void AndroidLook(float yaw, float pitch);
|
||||
void AndroidLookJoystick(float yaw, float pitch);
|
||||
void AndroidOSD(const char * cmd);
|
||||
|
||||
void AndroidAutomapControl(float zoom,float dx,float dy);
|
||||
|
||||
void AndroidShowKeyboard(int onf);
|
||||
|
||||
void AndroidToggleButtonEditor(void);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,144 +0,0 @@
|
|||
//-------------------------------------------------------------------------
|
||||
/*
|
||||
Copyright (C) 2010 EDuke32 developers and contributors
|
||||
|
||||
This file is part of EDuke32.
|
||||
|
||||
EDuke32 is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License version 2
|
||||
as published by the Free Software Foundation.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
#include "compat.h"
|
||||
|
||||
#define SETUPFILENAME "mapster32.cfg"
|
||||
|
||||
#define TICSPERFRAME 3
|
||||
|
||||
// #define VULGARITY
|
||||
|
||||
//#define NUMOPTIONS 9
|
||||
//char option[NUMOPTIONS] = {0,0,0,0,0,0,1,0,0};
|
||||
|
||||
char default_buildkeys[NUMBUILDKEYS] =
|
||||
{
|
||||
0xc8,0xd0,0xcb,0xcd,0x2a,0x9d,0x1d,0x39,
|
||||
0x1e,0x2c,0xd1,0xc9,0x47,0x49,
|
||||
0x9c,0x1c,0xd,0xc,0xf,0x29
|
||||
};
|
||||
|
||||
extern char changechar(char dachar, int32_t dadir, char smooshyalign, char boundcheck);
|
||||
|
||||
static char autospritehelp=0, autosecthelp=0;
|
||||
//static int32_t lastmessagetime=-1;
|
||||
|
||||
static char tempbuf[1024];
|
||||
static int32_t numsprite[MAXTILES], multisprite[MAXTILES];
|
||||
static char lo[64];
|
||||
static int16_t curwall=0, curwallnum=0;
|
||||
static int16_t /*cursearchsprite=0,*/ cursearchspritenum=0, cursector_lotag=0, cursectornum=0;
|
||||
static int16_t search_lotag=0,search_hitag=0;
|
||||
static char wallsprite=0;
|
||||
static char helpon=0;
|
||||
//static char onwater=0;
|
||||
static uint8_t onnames=4, usedcount=1;
|
||||
static int16_t cursprite;
|
||||
static int32_t ppointhighlight;
|
||||
//static int32_t counter=0;
|
||||
static uint8_t nosprites=0,purpleon=0,skill=4;
|
||||
static uint8_t framerateon=1,shadepreview=0;
|
||||
|
||||
static int32_t autosavetimer;
|
||||
|
||||
static void SearchSectors(int32_t dir);
|
||||
static inline void SpriteName(int16_t spritenum, char *lo2);
|
||||
//static void PrintStatus(const char *string,int32_t num,char x,char y,char color);
|
||||
|
||||
static void EditSpriteData(int16_t spritenum);
|
||||
static void EditWallData(int16_t wallnum);
|
||||
static void EditSectorData(int16_t sectnum);
|
||||
|
||||
|
||||
static int32_t updownunits=1024;
|
||||
|
||||
|
||||
//int32_t intro=0;
|
||||
|
||||
//void ContextHelp(int16_t spritenum);
|
||||
//void ResetKeys();
|
||||
|
||||
//#define KEY_PRESSED(sc) KB_KeyPressed((sc))
|
||||
|
||||
// This table defines the various zoom levels, the numbers being the pixel width
|
||||
// and height of the sprite when plotted on the screen. Probably zooms in too far
|
||||
// for some, but I'm a blind old git :-(
|
||||
|
||||
#define FUCKING_GOOD_EYESIGHT 16
|
||||
static const int32_t ZoomToThumbSize[] =
|
||||
{
|
||||
FUCKING_GOOD_EYESIGHT, 32, 64, 128, 192, 256, 384, 512
|
||||
};
|
||||
|
||||
#define NUM_ZOOMS ARRAY_SIZE(ZoomToThumbSize)
|
||||
#define INITIAL_ZOOM 2
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int32_t *pIds; // ptr to list of tile Ids
|
||||
int32_t nIds; // num of tile ids
|
||||
char *szText; // description to present to user.
|
||||
char key1; // key1 and key2 are two alternative keypresses used to
|
||||
char key2; // select tile set. Bodge to do eary upper/lower case handling
|
||||
char color1; // 2d sprite color 1
|
||||
char color2; // 2d sprite color 2
|
||||
} TileGroup;
|
||||
|
||||
#define MAX_TILE_GROUPS 32
|
||||
#define MAX_TILE_GROUP_ENTRIES MAXUSERTILES
|
||||
|
||||
static TileGroup s_TileGroups[MAX_TILE_GROUPS];
|
||||
static int32_t tilegroupItems;
|
||||
static int32_t tilegroupActors;
|
||||
static int32_t tile_groups = 0;
|
||||
|
||||
|
||||
#define NUMPRINTABLES 94
|
||||
#define MAX_ALPHABETS 32
|
||||
// alphabet definitions struct for the sprite text renderer
|
||||
typedef struct
|
||||
{
|
||||
int16_t pic[NUMPRINTABLES]; // maps printable ASCII chars to tilenums
|
||||
int8_t xofs[NUMPRINTABLES]; // additional offset
|
||||
int8_t yofs[NUMPRINTABLES];
|
||||
} alphabet_t;
|
||||
|
||||
static alphabet_t alphabets[MAX_ALPHABETS];
|
||||
static int32_t numalphabets = 0;
|
||||
|
||||
#define FIRST_USER_ART_TILE 3584
|
||||
// Some atomic tiles are sprinkled in the V1.3d's area but
|
||||
// this is where the main atomic tiles start :-
|
||||
#define FIRST_ATOMIC_TILE 4096
|
||||
#define FIRST_EXTENDED_TILE 6144
|
||||
#define SECOND_EXTENDED_TILE 9216
|
||||
|
||||
extern int16_t localartfreq[MAXTILES];
|
||||
extern int16_t localartlookup[MAXTILES], localartlookupnum;
|
||||
extern int32_t lockclock;
|
||||
|
||||
static int32_t gs_spriteTagValue[3][7];
|
||||
static char gs_spriteTagInterested[3][7];
|
||||
static int16_t gs_cursprite=-1;
|
||||
|
||||
//int32_t g_musicSize=0;
|
||||
|
|
@ -25,16 +25,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "demo.h"
|
||||
#include "duke3d.h"
|
||||
#include "input.h"
|
||||
#include "in_android.h"
|
||||
#include "menus.h"
|
||||
#include "osdcmds.h"
|
||||
#include "savegame.h"
|
||||
#include "xxhash.h"
|
||||
|
||||
#ifndef __ANDROID__
|
||||
droidinput_t droidinput;
|
||||
#endif
|
||||
|
||||
// common positions
|
||||
#define MENU_MARGIN_REGULAR 40
|
||||
#define MENU_MARGIN_WIDE 32
|
||||
|
|
@ -47,24 +42,10 @@ static FORCE_INLINE void Menu_StartTextInput()
|
|||
{
|
||||
KB_FlushKeyboardQueue();
|
||||
KB_ClearKeysDown();
|
||||
#if defined EDUKE32_TOUCH_DEVICES && defined SDL_MAJOR_VERSION && SDL_MAJOR_VERSION > 1
|
||||
# if defined __ANDROID__
|
||||
AndroidShowKeyboard(1);
|
||||
# else
|
||||
SDL_StartTextInput();
|
||||
# endif
|
||||
#endif
|
||||
}
|
||||
|
||||
static FORCE_INLINE void Menu_StopTextInput()
|
||||
{
|
||||
#if defined EDUKE32_TOUCH_DEVICES && defined SDL_MAJOR_VERSION && SDL_MAJOR_VERSION > 1
|
||||
# if defined __ANDROID__
|
||||
AndroidShowKeyboard(0);
|
||||
# else
|
||||
SDL_StopTextInput();
|
||||
# endif
|
||||
#endif
|
||||
}
|
||||
|
||||
static FORCE_INLINE void rotatesprite_ybounds(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum, int8_t dashade, char dapalnum, int32_t dastat, int32_t ydim_upper, int32_t ydim_lower)
|
||||
|
|
|
|||
|
|
@ -30,14 +30,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "savegame.h"
|
||||
#include "sbar.h"
|
||||
|
||||
#ifdef LUNATIC
|
||||
# include "lunatic_game.h"
|
||||
#endif
|
||||
|
||||
#ifdef EDUKE32_TOUCH_DEVICES
|
||||
#include "in_android.h"
|
||||
#endif
|
||||
|
||||
#include "vfs.h"
|
||||
|
||||
struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat;
|
||||
|
|
|
|||
|
|
@ -24,10 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "demo.h"
|
||||
#include "enet/enet.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include "android.h"
|
||||
#endif
|
||||
|
||||
int32_t lastvisinc;
|
||||
hudweapon_t hudweap;
|
||||
|
||||
|
|
|
|||
|
|
@ -20,10 +20,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
*/
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include "android.h"
|
||||
#endif
|
||||
|
||||
#include "anim.h"
|
||||
#include "colmatch.h"
|
||||
#include "compat.h"
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
//-------------------------------------------------------------------------
|
||||
/*
|
||||
Copyright (C) 2010 EDuke32 developers and contributors
|
||||
|
||||
This file is part of EDuke32.
|
||||
|
||||
EDuke32 is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License version 2
|
||||
as published by the Free Software Foundation.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
#ifndef sounds_mapster32_h_
|
||||
#define sounds_mapster32_h_
|
||||
|
||||
#include "build.h"
|
||||
#include "sounds_common.h"
|
||||
|
||||
#pragma pack(push,1)
|
||||
|
||||
/// vvv sound structs from duke3d.h
|
||||
typedef struct {
|
||||
int32_t voice;
|
||||
int32_t ow;
|
||||
} SOUNDOWNER;
|
||||
|
||||
typedef struct {
|
||||
char *filename, *ptr;
|
||||
int32_t length, num, soundsiz;
|
||||
SOUNDOWNER SoundOwner[4];
|
||||
int16_t ps,pe,vo;
|
||||
char pr,m;
|
||||
char lock;
|
||||
char *definedname; // new
|
||||
} sound_t;
|
||||
|
||||
#define MAXSOUNDS 4096
|
||||
extern sound_t g_sounds[MAXSOUNDS];
|
||||
|
||||
extern int32_t g_numEnvSoundsPlaying;
|
||||
extern int32_t NumVoices;
|
||||
|
||||
int32_t S_SoundStartup(void);
|
||||
void S_SoundShutdown(void);
|
||||
int32_t S_PlaySound3D(int32_t, int32_t, const vec3_t*);
|
||||
void S_PlaySound(int32_t);
|
||||
int32_t A_PlaySound(uint32_t num, int32_t i);
|
||||
void S_StopSound(int32_t num);
|
||||
void S_StopEnvSound(int32_t num,int32_t i);
|
||||
void S_StopAllSounds(void);
|
||||
void S_Update(void);
|
||||
int32_t A_CheckSoundPlaying(int32_t i, int32_t num);
|
||||
int32_t S_CheckSoundPlaying(int32_t i, int32_t num);
|
||||
void S_ClearSoundLocks(void);
|
||||
int32_t S_SoundsPlaying(int32_t i);
|
||||
int32_t S_InvalidSound(int32_t num);
|
||||
int32_t S_SoundFlags(int32_t num);
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
#endif
|
||||
|
|
@ -16,10 +16,6 @@
|
|||
#include "osd.h"
|
||||
#include "pragmas.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include "android.h"
|
||||
#endif
|
||||
|
||||
bool CONTROL_Started = false;
|
||||
bool CONTROL_MouseEnabled = false;
|
||||
bool CONTROL_MousePresent = false;
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
//-------------------------------------------------------------------------
|
||||
/*
|
||||
Copyright (C) 2010 EDuke32 developers and contributors
|
||||
|
||||
This file is part of EDuke32.
|
||||
|
||||
EDuke32 is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License version 2
|
||||
as published by the Free Software Foundation.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
#ifndef android_h_
|
||||
#define android_h_
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include "compat.h"
|
||||
#include "control.h"
|
||||
#include "in_android.h"
|
||||
|
||||
//extern int android_sample_rate;
|
||||
|
||||
//extern int android_audio_buffer_size;
|
||||
|
||||
|
||||
extern void CONTROL_Android_ClearButton(int32_t whichbutton);
|
||||
extern void CONTROL_Android_PollDevices(ControlInfo *info);
|
||||
extern void CONTROL_Android_SetLastWeapon(int w);
|
||||
|
||||
extern void CONTROL_Android_ScrollMap(int32_t *angle,int32_t *x, int32_t *y, uint16_t *zoom );
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
@ -26,10 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "renderlayer.h"
|
||||
#include "cmdline.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
# include "android.h"
|
||||
#endif
|
||||
|
||||
#if defined RENDERTYPESDL && defined SDL_TARGET && SDL_TARGET > 1
|
||||
# include "sdl_inc.h"
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -41,10 +41,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "cmdline.h"
|
||||
#include "palette.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include "android.h"
|
||||
#endif
|
||||
|
||||
// Uncomment to prevent anything except mirrors from drawing. It is sensible to
|
||||
// also uncomment ENGINE_CLEAR_SCREEN in build/src/engine_priv.h.
|
||||
//#define DEBUG_MIRRORS_ONLY
|
||||
|
|
|
|||
|
|
@ -1,120 +0,0 @@
|
|||
#include "function.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
#define MENU_UP 0x200
|
||||
#define MENU_DOWN 0x201
|
||||
#define MENU_LEFT 0x202
|
||||
#define MENU_RIGHT 0x203
|
||||
#define MENU_SELECT 0x204
|
||||
#define MENU_BACK 0x205
|
||||
|
||||
#define KEY_QUICK_CMD 0x1005
|
||||
#define KEY_SHOW_KBRD 0x1008
|
||||
#define KEY_SHOW_INVEN 0x1009
|
||||
#define KEY_QUICK_SAVE 0x100A
|
||||
#define KEY_QUICK_LOAD 0x100B
|
||||
|
||||
#define KEY_QUICK_KEY1 0x1011
|
||||
#define KEY_QUICK_KEY2 0x1012
|
||||
#define KEY_QUICK_KEY3 0x1013
|
||||
#define KEY_QUICK_KEY4 0x1014
|
||||
|
||||
// #define BUTTONSET(x,value) (CONTROL_ButtonState |= ((uint64_t)value<<((uint64_t)(x))))
|
||||
// #define BUTTONCLEAR(x) (CONTROL_ButtonState &= ~((uint64_t)1<<((uint64_t)(x))))
|
||||
|
||||
#define PRECISIONSHOOTFACTOR 0.3f
|
||||
|
||||
// where do these numbers come from?
|
||||
#define ANDROIDMOVEFACTOR 6400
|
||||
#define ANDROIDLOOKFACTOR 1600
|
||||
|
||||
#define ANDROIDPITCHFACTORJOYSTICK 2000
|
||||
#define ANDROIDYAWFACTORJOYSTICK 4000
|
||||
|
||||
typedef enum {
|
||||
R_TOUCH_MODE,
|
||||
R_PLAYER_GOTWEAPON,
|
||||
R_UD_OVERHEAD_ON,
|
||||
R_UD_SCROLLMODE,
|
||||
R_PLAYER_LASTWEAPON,
|
||||
R_GAME_PAUSED,
|
||||
R_PLAYER_DEAD_FLAG,
|
||||
R_PLAYER_INV_AMOUNT,
|
||||
R_SOMETHINGONPLAYER
|
||||
} portableread_t;
|
||||
|
||||
|
||||
typedef enum {
|
||||
TOUCH_SCREEN_BLANK, //Nothing on screen (not used)
|
||||
TOUCH_SCREEN_BLANK_TAP, //One button filling screen with no graphic, tap to send Enter key
|
||||
TOUCH_SCREEN_YES_NO, //Yes/No buttons on screen, sends Enter or Esc
|
||||
TOUCH_SCREEN_MENU, //Normal menu
|
||||
TOUCH_SCREEN_MENU_NOBACK, // menu without back button
|
||||
TOUCH_SCREEN_GAME, //Normal game screen
|
||||
TOUCH_SCREEN_AUTOMAP, //When auto map is up (not used yet)
|
||||
TOUCH_SCREEN_CONSOLE //When Console is up
|
||||
} touchscreemode_t;
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int32_t crouchToggleState;
|
||||
int32_t lastWeapon;
|
||||
int32_t toggleCrouch;
|
||||
int32_t quickSelectWeapon;
|
||||
|
||||
uint64_t functionSticky; //To let at least one tick
|
||||
uint64_t functionHeld;
|
||||
|
||||
int32_t left_double_action;
|
||||
int32_t right_double_action;
|
||||
|
||||
int32_t invertLook, hideStick;
|
||||
|
||||
double pitch, yaw;
|
||||
double pitch_joystick, yaw_joystick;
|
||||
float forwardmove, sidemove;
|
||||
|
||||
// set by configuration UI
|
||||
float strafe_sens, forward_sens;
|
||||
float pitch_sens, yaw_sens;
|
||||
|
||||
float gameControlsAlpha;
|
||||
} droidinput_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int32_t audio_sample_rate;
|
||||
int32_t audio_buffer_size;
|
||||
uint16_t screen_width, screen_height;
|
||||
} droidsysinfo_t;
|
||||
|
||||
extern droidinput_t droidinput;
|
||||
extern droidsysinfo_t droidinfo;
|
||||
|
||||
void AndroidTimer(int tics);
|
||||
int AndroidKeyEvent(int state, int code, int unicode);
|
||||
int AndroidRead(portableread_t r);
|
||||
|
||||
void AndroidAction(int state, int action);
|
||||
|
||||
void AndroidMouseMenu(float x,float y);
|
||||
void AndroidMouseMenuButton(int state,int button);
|
||||
|
||||
void AndroidMove(float fwd, float strafe);
|
||||
void AndroidLook(float yaw, float pitch);
|
||||
void AndroidLookJoystick(float yaw, float pitch);
|
||||
void AndroidOSD(const char * cmd);
|
||||
|
||||
void AndroidAutomapControl(float zoom,float dx,float dy);
|
||||
|
||||
void AndroidShowKeyboard(int onf);
|
||||
|
||||
void AndroidToggleButtonEditor(void);
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,144 +0,0 @@
|
|||
//-------------------------------------------------------------------------
|
||||
/*
|
||||
Copyright (C) 2010 EDuke32 developers and contributors
|
||||
|
||||
This file is part of EDuke32.
|
||||
|
||||
EDuke32 is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License version 2
|
||||
as published by the Free Software Foundation.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
#include "compat.h"
|
||||
|
||||
#define SETUPFILENAME "mapster32.cfg"
|
||||
|
||||
#define TICSPERFRAME 3
|
||||
|
||||
// #define VULGARITY
|
||||
|
||||
//#define NUMOPTIONS 9
|
||||
//char option[NUMOPTIONS] = {0,0,0,0,0,0,1,0,0};
|
||||
|
||||
char default_buildkeys[NUMBUILDKEYS] =
|
||||
{
|
||||
0xc8,0xd0,0xcb,0xcd,0x2a,0x9d,0x1d,0x39,
|
||||
0x1e,0x2c,0xd1,0xc9,0x47,0x49,
|
||||
0x9c,0x1c,0xd,0xc,0xf,0x29
|
||||
};
|
||||
|
||||
extern char changechar(char dachar, int32_t dadir, char smooshyalign, char boundcheck);
|
||||
|
||||
static char autospritehelp=0, autosecthelp=0;
|
||||
//static int32_t lastmessagetime=-1;
|
||||
|
||||
static char tempbuf[1024];
|
||||
static int32_t numsprite[MAXTILES], multisprite[MAXTILES];
|
||||
static char lo[64];
|
||||
static int16_t curwall=0, curwallnum=0;
|
||||
static int16_t /*cursearchsprite=0,*/ cursearchspritenum=0, cursector_lotag=0, cursectornum=0;
|
||||
static int16_t search_lotag=0,search_hitag=0;
|
||||
static char wallsprite=0;
|
||||
static char helpon=0;
|
||||
//static char onwater=0;
|
||||
static uint8_t onnames=4, usedcount=1;
|
||||
static int16_t cursprite;
|
||||
static int32_t ppointhighlight;
|
||||
//static int32_t counter=0;
|
||||
static uint8_t nosprites=0,purpleon=0,skill=4;
|
||||
static uint8_t framerateon=1,shadepreview=0;
|
||||
|
||||
static int32_t autosavetimer;
|
||||
|
||||
static void SearchSectors(int32_t dir);
|
||||
static inline void SpriteName(int16_t spritenum, char *lo2);
|
||||
//static void PrintStatus(const char *string,int32_t num,char x,char y,char color);
|
||||
|
||||
static void EditSpriteData(int16_t spritenum);
|
||||
static void EditWallData(int16_t wallnum);
|
||||
static void EditSectorData(int16_t sectnum);
|
||||
|
||||
|
||||
static int32_t updownunits=1024;
|
||||
|
||||
|
||||
//int32_t intro=0;
|
||||
|
||||
//void ContextHelp(int16_t spritenum);
|
||||
//void ResetKeys();
|
||||
|
||||
//#define KEY_PRESSED(sc) KB_KeyPressed((sc))
|
||||
|
||||
// This table defines the various zoom levels, the numbers being the pixel width
|
||||
// and height of the sprite when plotted on the screen. Probably zooms in too far
|
||||
// for some, but I'm a blind old git :-(
|
||||
|
||||
#define FUCKING_GOOD_EYESIGHT 16
|
||||
static const int32_t ZoomToThumbSize[] =
|
||||
{
|
||||
FUCKING_GOOD_EYESIGHT, 32, 64, 128, 192, 256, 384, 512
|
||||
};
|
||||
|
||||
#define NUM_ZOOMS ARRAY_SIZE(ZoomToThumbSize)
|
||||
#define INITIAL_ZOOM 2
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int32_t *pIds; // ptr to list of tile Ids
|
||||
int32_t nIds; // num of tile ids
|
||||
char *szText; // description to present to user.
|
||||
char key1; // key1 and key2 are two alternative keypresses used to
|
||||
char key2; // select tile set. Bodge to do eary upper/lower case handling
|
||||
char color1; // 2d sprite color 1
|
||||
char color2; // 2d sprite color 2
|
||||
} TileGroup;
|
||||
|
||||
#define MAX_TILE_GROUPS 32
|
||||
#define MAX_TILE_GROUP_ENTRIES MAXUSERTILES
|
||||
|
||||
static TileGroup s_TileGroups[MAX_TILE_GROUPS];
|
||||
static int32_t tilegroupItems;
|
||||
static int32_t tilegroupActors;
|
||||
static int32_t tile_groups = 0;
|
||||
|
||||
|
||||
#define NUMPRINTABLES 94
|
||||
#define MAX_ALPHABETS 32
|
||||
// alphabet definitions struct for the sprite text renderer
|
||||
typedef struct
|
||||
{
|
||||
int16_t pic[NUMPRINTABLES]; // maps printable ASCII chars to tilenums
|
||||
int8_t xofs[NUMPRINTABLES]; // additional offset
|
||||
int8_t yofs[NUMPRINTABLES];
|
||||
} alphabet_t;
|
||||
|
||||
static alphabet_t alphabets[MAX_ALPHABETS];
|
||||
static int32_t numalphabets = 0;
|
||||
|
||||
#define FIRST_USER_ART_TILE 3584
|
||||
// Some atomic tiles are sprinkled in the V1.3d's area but
|
||||
// this is where the main atomic tiles start :-
|
||||
#define FIRST_ATOMIC_TILE 4096
|
||||
#define FIRST_EXTENDED_TILE 6144
|
||||
#define SECOND_EXTENDED_TILE 9216
|
||||
|
||||
extern int16_t localartfreq[MAXTILES];
|
||||
extern int16_t localartlookup[MAXTILES], localartlookupnum;
|
||||
extern int32_t lockclock;
|
||||
|
||||
static int32_t gs_spriteTagValue[3][7];
|
||||
static char gs_spriteTagInterested[3][7];
|
||||
static int16_t gs_cursprite=-1;
|
||||
|
||||
//int32_t g_musicSize=0;
|
||||
|
|
@ -30,11 +30,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "menus.h"
|
||||
#include "cheats.h"
|
||||
|
||||
#include "in_android.h"
|
||||
#ifndef __ANDROID__
|
||||
droidinput_t droidinput;
|
||||
#endif
|
||||
|
||||
// common positions
|
||||
#define MENU_MARGIN_REGULAR 40
|
||||
#define MENU_MARGIN_WIDE 32
|
||||
|
|
|
|||
|
|
@ -248,7 +248,6 @@ void Net_DoPrediction(void)
|
|||
if (pPlayer->on_motorcycle && pSprite->extra > 0)
|
||||
{
|
||||
int var64, var68, var6c, var74, var7c;
|
||||
int16_t var84;
|
||||
if (my_moto_speed < 0)
|
||||
my_moto_speed = 0;
|
||||
if (TEST_SYNC_KEY(playerBits, SK_CROUCH))
|
||||
|
|
@ -432,7 +431,7 @@ void Net_DoPrediction(void)
|
|||
}
|
||||
else if (my_moto_speed >= 20 && myonground == 1 && (my_moto_on_mud || my_moto_on_oil))
|
||||
{
|
||||
short var9c, vara0, vara4;
|
||||
short var9c, vara0;
|
||||
var9c = my_moto_speed;
|
||||
vara0 = fix16_to_int(myang);
|
||||
if (my_moto_on_oil)
|
||||
|
|
@ -448,7 +447,6 @@ void Net_DoPrediction(void)
|
|||
else if (pPlayer->on_boat && pSprite->extra > 0)
|
||||
{
|
||||
int vara8, varac, varb0, varb4, varbc, varc4;
|
||||
int16_t varcc;
|
||||
if (my_moto_speed < 0)
|
||||
my_moto_speed = 0;
|
||||
if (TEST_SYNC_KEY(playerBits, SK_CROUCH) && TEST_SYNC_KEY(playerBits, SK_JUMP))
|
||||
|
|
@ -1418,7 +1416,7 @@ char Net_PlayerSync(void)
|
|||
|
||||
char Net_PlayerSync2(void)
|
||||
{
|
||||
int j, nextj;
|
||||
int nextj;
|
||||
uint16_t crc = 0;
|
||||
DukePlayer_t *pp;
|
||||
spritetype *spr;
|
||||
|
|
@ -1684,7 +1682,7 @@ void Net_AddSyncInfoToPacket(int *j)
|
|||
|
||||
void Net_GetSyncInfoFromPacket(uint8_t *packbuf, int packbufleng, int *j, int otherconnectindex)
|
||||
{
|
||||
int sb, i;
|
||||
int sb;
|
||||
extern int syncvaltail, syncvaltottail;
|
||||
playerdata_t *ppo = &g_player[otherconnectindex];
|
||||
char found = 0;
|
||||
|
|
@ -3065,7 +3063,6 @@ void Net_ParseClientPacket(ENetEvent *event)
|
|||
{
|
||||
uint8_t *pbuf = event->packet->data;
|
||||
int32_t packbufleng = event->packet->dataLength;
|
||||
int16_t j;
|
||||
int32_t other = pbuf[--packbufleng];
|
||||
switch (pbuf[0])
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,10 +34,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
# include "lunatic_game.h"
|
||||
#endif
|
||||
|
||||
#ifdef EDUKE32_TOUCH_DEVICES
|
||||
#include "in_android.h"
|
||||
#endif
|
||||
|
||||
struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat;
|
||||
float r_ambientlight = 1.0, r_ambientlightrecip = 1.0;
|
||||
|
||||
|
|
|
|||
|
|
@ -24,10 +24,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "demo.h"
|
||||
#include "enet/enet.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include "android.h"
|
||||
#endif
|
||||
|
||||
int32_t PHEIGHT = PHEIGHT_DUKE;
|
||||
|
||||
int32_t lastvisinc;
|
||||
|
|
|
|||
|
|
@ -32,10 +32,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
#include "demo.h"
|
||||
#include "mdsprite.h"
|
||||
|
||||
#ifdef __ANDROID__
|
||||
#include "android.h"
|
||||
#endif
|
||||
|
||||
#define COLOR_RED redcol
|
||||
#define COLOR_WHITE whitecol
|
||||
|
||||
|
|
|
|||
|
|
@ -1,71 +0,0 @@
|
|||
//-------------------------------------------------------------------------
|
||||
/*
|
||||
Copyright (C) 2010 EDuke32 developers and contributors
|
||||
|
||||
This file is part of EDuke32.
|
||||
|
||||
EDuke32 is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License version 2
|
||||
as published by the Free Software Foundation.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
|
||||
See the GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
//-------------------------------------------------------------------------
|
||||
|
||||
#ifndef sounds_mapster32_h_
|
||||
#define sounds_mapster32_h_
|
||||
|
||||
#include "build.h"
|
||||
#include "sounds_common.h"
|
||||
|
||||
#pragma pack(push,1)
|
||||
|
||||
/// vvv sound structs from duke3d.h
|
||||
typedef struct {
|
||||
int32_t voice;
|
||||
int32_t ow;
|
||||
} SOUNDOWNER;
|
||||
|
||||
typedef struct {
|
||||
char *filename, *ptr;
|
||||
int32_t length, num, soundsiz;
|
||||
SOUNDOWNER SoundOwner[4];
|
||||
int16_t ps,pe,vo;
|
||||
char pr,m;
|
||||
char lock;
|
||||
char *definedname; // new
|
||||
} sound_t;
|
||||
|
||||
#define MAXSOUNDS 4096
|
||||
extern sound_t g_sounds[MAXSOUNDS];
|
||||
|
||||
extern int32_t g_numEnvSoundsPlaying;
|
||||
extern int32_t NumVoices;
|
||||
|
||||
int32_t S_SoundStartup(void);
|
||||
void S_SoundShutdown(void);
|
||||
int32_t S_PlaySound3D(int32_t, int32_t, const vec3_t*);
|
||||
void S_PlaySound(int32_t);
|
||||
int32_t A_PlaySound(uint32_t num, int32_t i);
|
||||
void S_StopSound(int32_t num);
|
||||
void S_StopEnvSound(int32_t num,int32_t i);
|
||||
void S_StopAllSounds(void);
|
||||
void S_Update(void);
|
||||
int32_t A_CheckSoundPlaying(int32_t i, int32_t num);
|
||||
int32_t S_CheckSoundPlaying(int32_t i, int32_t num);
|
||||
void S_ClearSoundLocks(void);
|
||||
int32_t S_SoundsPlaying(int32_t i);
|
||||
int32_t S_InvalidSound(int32_t num);
|
||||
int32_t S_SoundFlags(int32_t num);
|
||||
|
||||
#pragma pack(pop)
|
||||
|
||||
#endif
|
||||
Loading…
Reference in a new issue