Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include/declaration cleanup for src/keyedit.c/h. 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10180 4a71c877-e1ca-e34f-864e-861f7616d084
master
Christian Ohm 2010-03-06 23:21:08 +00:00 committed by Git SVN Gateway
parent 4ad78bf9b2
commit 6cd520e4a0
4 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/keyedit.c
View File

@ -23,32 +23,21 @@
* alexl. * alexl.
*/ */
// ////////////////////////////////////////////////////////////////////////////
// includes
#include <string.h>
#include <SDL.h>
#include <physfs.h>
#include "lib/framework/frame.h" #include "lib/framework/frame.h"
#include "lib/framework/strres.h" #include "lib/ivis_common/bitimage.h"
#include "lib/framework/input.h" #include "lib/ivis_common/pieblitfunc.h"
#include "lib/sound/audio.h" #include "lib/sound/audio.h"
#include "lib/sound/audio_id.h"
#include "lib/widget/widget.h"
#include "frontend.h"
#include "frend.h" #include "frend.h"
#include "lib/ivis_common/textdraw.h" #include "frontend.h"
#include "lib/ivis_common/piepalette.h"
#include "hci.h" #include "hci.h"
#include "init.h" #include "init.h"
#include "loadsave.h"
#include "keymap.h"
#include "intimage.h"
#include "lib/ivis_common/bitimage.h"
#include "intdisplay.h" #include "intdisplay.h"
#include "lib/sound/audio_id.h" #include "keyedit.h"
#include "lib/ivis_common/pieblitfunc.h" #include "keymap.h"
#include "lib/netplay/netplay.h" #include "loadsave.h"
#include "main.h"
#include "multiint.h" #include "multiint.h"
// //////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////
@ -67,9 +56,6 @@
#define KM_X 30 #define KM_X 30
#define KM_Y 20 #define KM_Y 20
#define KM_RETURNX (KM_W-90)
#define KM_RETURNY (KM_H-42)
#define BUTTONSPERKEYMAPPAGE 20 #define BUTTONSPERKEYMAPPAGE 20
#define KM_ENTRYW 480 #define KM_ENTRYW 480
@ -80,19 +66,7 @@
// variables // variables
static KEY_MAPPING *selectedKeyMap; static KEY_MAPPING *selectedKeyMap;
// //////////////////////////////////////////////////////////////////////////// static char keymapVersion[8] = "KM_0002";
// protos
BOOL runKeyMapEditor (void);
static BOOL keyMapToString (char *pStr, KEY_MAPPING *psMapping);
static void displayKeyMap(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, PIELIGHT *pColours);
BOOL startKeyMapEditor (BOOL first);
BOOL saveKeyMap (void);
BOOL loadKeyMap (void);
static BOOL pushedKeyMap (UDWORD key);
char keymapVersion[8] = "KM_0002";
extern char KeyMapPath[];
// //////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////
// funcs // funcs
@ -318,7 +292,7 @@ static BOOL keyMapToString(char *pStr, KEY_MAPPING *psMapping)
// //////////////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////////////
// display a keymap on the interface. // display a keymap on the interface.
void displayKeyMap(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ_DECL_UNUSED PIELIGHT *pColours) static void displayKeyMap(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset, WZ_DECL_UNUSED PIELIGHT *pColours)
{ {
UDWORD x = xOffset+psWidget->x; UDWORD x = xOffset+psWidget->x;
UDWORD y = yOffset+psWidget->y; UDWORD y = yOffset+psWidget->y;

8
src/keyedit.h
View File

@ -26,10 +26,10 @@ extern "C"
{ {
#endif //__cplusplus #endif //__cplusplus
extern BOOL runKeyMapEditor (void); BOOL runKeyMapEditor(void);
extern BOOL startKeyMapEditor (BOOL first); BOOL startKeyMapEditor(BOOL first);
extern BOOL saveKeyMap (void); BOOL saveKeyMap(void);
extern BOOL loadKeyMap (void); BOOL loadKeyMap(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

1
src/main.h
View File

@ -42,6 +42,7 @@ extern void SetGameMode(GS_GAMEMODE status);
extern char SaveGamePath[PATH_MAX]; extern char SaveGamePath[PATH_MAX];
extern char datadir[PATH_MAX]; extern char datadir[PATH_MAX];
extern char configdir[PATH_MAX]; extern char configdir[PATH_MAX];
extern char KeyMapPath[PATH_MAX];
#define MAX_MODS 100 #define MAX_MODS 100

1
src/multiint.h
View File

@ -24,6 +24,7 @@
#ifndef __INCLUDED_SRC_MULTIINT_H__ #ifndef __INCLUDED_SRC_MULTIINT_H__
#define __INCLUDED_SRC_MULTIINT_H__ #define __INCLUDED_SRC_MULTIINT_H__
#include "lib/netplay/netplay.h"
#include "lib/widget/widgbase.h" #include "lib/widget/widgbase.h"
#ifdef __cplusplus #ifdef __cplusplus