(svn r7219) -Fix: Several warnings by gcc introduced in r7206 which MSVC found not of a problem. Thanks Tron
--- a/console.c Sun Nov 19 22:11:04 2006 +0000
+++ b/console.c Sun Nov 19 22:24:18 2006 +0000
@@ -152,7 +152,7 @@
break;
case WKC_CTRL | WKC_RETURN:
_iconsole_mode = (_iconsole_mode == ICONSOLE_FULL) ? ICONSOLE_OPENED : ICONSOLE_FULL;
- IConsoleResize(w);
+ IConsoleResize();
MarkWholeScreenDirty();
break;
case (WKC_CTRL | 'V'):
@@ -283,10 +283,8 @@
CloseConsoleLogIfActive();
}
-void IConsoleResize(Window *w)
+void IConsoleResize(void)
{
- assert(_iconsole_win == w);
-
switch (_iconsole_mode) {
case ICONSOLE_OPENED:
_iconsole_win->height = _screen.height / 3;
--- a/console.h Sun Nov 19 22:11:04 2006 +0000
+++ b/console.h Sun Nov 19 22:24:18 2006 +0000
@@ -118,7 +118,7 @@
void IConsoleInit(void);
void IConsoleFree(void);
void IConsoleClearBuffer(void);
-void IConsoleResize(Window *w);
+void IConsoleResize(void);
void IConsoleSwitch(void);
void IConsoleClose(void);
void IConsoleOpen(void);
--- a/engine_gui.c Sun Nov 19 22:11:04 2006 +0000
+++ b/engine_gui.c Sun Nov 19 22:24:18 2006 +0000
@@ -115,7 +115,7 @@
void ShowEnginePreviewWindow(EngineID engine)
{
- Window *w = AllocateWindowDescFront(&_engine_preview_desc, engine);
+ AllocateWindowDescFront(&_engine_preview_desc, engine);
}
static void DrawTrainEngineInfo(EngineID engine, int x, int y, int maxw)
--- a/misc_gui.c Sun Nov 19 22:11:04 2006 +0000
+++ b/misc_gui.c Sun Nov 19 22:24:18 2006 +0000
@@ -1852,10 +1852,8 @@
void ShowCheatWindow(void)
{
- Window *w;
-
DeleteWindowById(WC_CHEATS, 0);
- w = AllocateWindowDesc(&_cheats_desc);
+ AllocateWindowDesc(&_cheats_desc);
}
/** Resize the widgets in a window
--- a/sound.c Sun Nov 19 22:11:04 2006 +0000
+++ b/sound.c Sun Nov 19 22:24:18 2006 +0000
@@ -194,7 +194,7 @@
static void SndPlayScreenCoordFx(SoundFx sound, int x, int y)
{
- const Window* const *wz;
+ Window* const *wz;
if (msf.effect_vol == 0) return;
--- a/viewport.c Sun Nov 19 22:11:04 2006 +0000
+++ b/viewport.c Sun Nov 19 22:24:18 2006 +0000
@@ -183,7 +183,7 @@
static Point _vp_move_offs;
-static void DoSetViewportPosition(const Window* const *wz, int left, int top, int width, int height)
+static void DoSetViewportPosition(Window* const *wz, int left, int top, int width, int height)
{
for (; wz != _last_z_window; wz++) {
--- a/window.c Sun Nov 19 22:11:04 2006 +0000
+++ b/window.c Sun Nov 19 22:24:18 2006 +0000
@@ -222,7 +222,7 @@
static void DrawOverlappedWindow(Window* const *wz, int left, int top, int right, int bottom)
{
- const Window* const *vz = wz;
+ Window* const *vz = wz;
int x;
while (++vz != _last_z_window) {
@@ -1058,7 +1058,7 @@
ny = y;
if (_patches.window_snap_radius != 0) {
- const Window* const *vz;
+ Window* const *vz;
int hsnap = _patches.window_snap_radius;
int vsnap = _patches.window_snap_radius;
@@ -1370,8 +1370,8 @@
static void MaybeBringWindowToFront(const Window *w)
{
- const Window* const *wz;
- const Window* const *uz;
+ Window* const *wz;
+ Window* const *uz;
if (w->window_class == WC_MAIN_WINDOW ||
IsVitalWindow(w) ||
@@ -1725,7 +1725,7 @@
void InvalidateWindow(WindowClass cls, WindowNumber number)
{
- const Window* const *wz;
+ Window* const *wz;
FOR_ALL_WINDOWS(wz) {
const Window *w = *wz;
@@ -1745,7 +1745,7 @@
void InvalidateWindowWidget(WindowClass cls, WindowNumber number, byte widget_index)
{
- const Window* const *wz;
+ Window* const *wz;
FOR_ALL_WINDOWS(wz) {
const Window *w = *wz;
@@ -1757,7 +1757,7 @@
void InvalidateWindowClasses(WindowClass cls)
{
- const Window* const *wz;
+ Window* const *wz;
FOR_ALL_WINDOWS(wz) {
if ((*wz)->window_class == cls) SetWindowDirty(*wz);
@@ -1917,8 +1917,8 @@
break;
case WC_CONSOLE:
- IConsoleResize(w);
- break;
+ IConsoleResize();
+ continue;
default:
left = w->left;