[winmbf] 01/02: fix some const-ness issues
Fabian Greffrath
fabian-guest at moszumanska.debian.org
Fri Feb 27 09:17:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
fabian-guest pushed a commit to branch master
in repository winmbf.
commit 81121db942464ea041d2e26739e7cbdb493d68fa
Author: Fabian Greffrath <fabian at greffrath.com>
Date: Fri Feb 27 10:04:09 2015 +0100
fix some const-ness issues
---
debian/patches/dfsg-menus.patch | 8 ++++----
debian/patches/portability-linux.patch | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/debian/patches/dfsg-menus.patch b/debian/patches/dfsg-menus.patch
index 693b6de..68e26fa 100644
--- a/debian/patches/dfsg-menus.patch
+++ b/debian/patches/dfsg-menus.patch
@@ -4,7 +4,7 @@
// choice=0:leftarrow,1:rightarrow
void (*routine)(int choice);
char alphaKey; // hotkey in menu
-+ const char *alttext;
++ char *alttext;
} menuitem_t;
typedef struct menu_s
@@ -12,7 +12,7 @@
void M_WriteText(int x, int y, char *string);
int M_StringWidth(char *string);
int M_StringHeight(char *string);
-+void M_DrawTitle(int x, int y, const char *patch, const char *alttext);
++void M_DrawTitle(int x, int y, const char *patch, char *alttext);
void M_StartControlPanel(void);
void M_StartMessage(char *string,void *routine,boolean input);
void M_StopMessage(void);
@@ -218,7 +218,7 @@
+ else
+ for (i = 0; i < max; i++)
+ {
-+ const char *alttext = currentMenu->menuitems[i].alttext;
++ char *alttext = currentMenu->menuitems[i].alttext;
+ if (alttext)
+ M_WriteText(x, y+8-(M_StringHeight(alttext)/2), alttext);
+ y += LINEHEIGHT;
@@ -230,7 +230,7 @@
}
}
-+void M_DrawTitle(int x, int y, const char *patch, const char *alttext)
++void M_DrawTitle(int x, int y, const char *patch, char *alttext)
+{
+ if (W_CheckNumForName(patch) >= 0)
+ V_DrawPatchDirect(x,y,0,W_CacheLumpName(patch,PU_CACHE));
diff --git a/debian/patches/portability-linux.patch b/debian/patches/portability-linux.patch
index 28edc16..d97350f 100644
--- a/debian/patches/portability-linux.patch
+++ b/debian/patches/portability-linux.patch
@@ -34,7 +34,7 @@
+ #define stricmp strcasecmp
+ #define strnicmp strncasecmp
+ static inline char *strlwr (char *str) {
-+ const char *c = str;
++ char *c = str;
+ while (*str != '\0')
+ {
+ *str = tolower (*str);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/winmbf.git
More information about the Pkg-games-commits
mailing list