cpp/openttd-patchpack/source Changeset - r873:8376969b1534

Changeset - r873:8376969b1534

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

tron - 19 years ago 2005-01-03 21:29:59
tron@openttd.org

(svn r1354) Use WindowClass/WindowNumber to store/pass window class/number, not some arbitrary data types

3 files changed with 4 insertions and 4 deletions:

functions.h

viewport.c

viewport.h

0 comments (0 inline, 0 general)

functions.h

➞

Show inline comments

@@ @@ -194,25 +194,25 @@ uint ConvertIntDate(uint date); @@
 void CSleep(int milliseconds);
 /* misc functions */
 void MarkTileDirty(int x, int y);
 void MarkTileDirtyByTile(TileIndex tile);
 void InvalidateWindow(byte cls, WindowNumber number);
 void InvalidateWindowWidget(byte cls, WindowNumber number, byte widget_index);
 void InvalidateWindowClasses(byte cls);
 void DeleteWindowById(WindowClass cls, WindowNumber number);
 void SetObjectToPlaceWnd(int icon, byte mode, Window *w);
-void SetObjectToPlace(int icon, byte mode, byte window_class, uint16 window_num);
+void SetObjectToPlace(int icon, byte mode, WindowClass window_class, WindowNumber window_num);
 void ResetObjectToPlace();
 bool ScrollWindowToTile(TileIndex tile, Window * w);
 bool ScrollWindowTo(int x, int y, Window * w);
 bool ScrollMainWindowToTile(TileIndex tile);
 bool ScrollMainWindowTo(int x, int y);
 void DrawSprite(uint32 img, int x, int y);
 bool EnsureNoVehicle(TileIndex tile);
 bool EnsureNoVehicleZ(TileIndex tile, byte z);
 void MarkAllViewportsDirty(int left, int top, int right, int bottom);

viewport.c

➞

Show inline comments

@@ @@ -2051,25 +2051,25 @@ bool VpHandlePlaceSizingDrag() @@
 	w->wndproc(w, &e);
 	return false;
+}
 void SetObjectToPlaceWnd(int icon, byte mode, Window *w)
+{
 	SetObjectToPlace(icon,mode,w->window_class, w->window_number);
+}
 #include "table/animcursors.h"
-void SetObjectToPlace(int icon, byte mode, byte window_class, uint16 window_num)
+void SetObjectToPlace(int icon, byte mode, WindowClass window_class, WindowNumber window_num)
+{
 	TileHighlightData *thd = _thd_ptr;
 	Window *w;
 	if (thd->place_mode != 0) {
 		thd->place_mode = 0;
 		w = FindWindowById(thd->window_class, thd->window_number);
 		if (w != NULL)
 			CallWindowEventNP(w, WE_ABORT_PLACE_OBJ);
+	}
 	SetTileSelectSize(1, 1);

viewport.h

➞

Show inline comments

@@ @@ -77,27 +77,27 @@ typedef struct TileHighlightData { @@
 	Point new_outersize;
 	Point selend, selstart;
 	byte dirty;
 	byte sizelimit;
 	byte drawstyle;
 	byte new_drawstyle;
 	byte next_drawstyle;
 	byte place_mode;
 	byte window_class;
 	bool make_square_red;
 	uint16 window_number;
 	WindowClass window_class;
 	WindowNumber window_number;
 	int userdata;
 	TileIndex redsq;
 } TileHighlightData;
 // common button handler
 bool HandlePlacePushButton(Window *w, int widget, uint32 cursor, int mode, PlaceProc *placeproc);
 /* viewport.c */
 // XXX - maximum viewports is maximum windows - 2 (main toolbar + status bar)
 VARDEF ViewPort _viewports[25 - 2];

0 comments (0 inline, 0 general)