cpp/openttd-patchpack/source Changeset - r5428:f3458f5e2b60

Changeset - r5428:f3458f5e2b60

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

rubidium - 17 years ago 2006-12-30 00:46:48
rubidium@openttd.org

(svn r7632) -Codechange: several small code cleanups of texteff, like moving magic values and defines to an enum and fix coding/documentation style.
-Codechange: make DeleteAnimatedTile a little clearer (pv2b).

1 file changed with 32 insertions and 26 deletions:

texteff.c

0 comments (0 inline, 0 general)

texteff.c

➞

Show inline comments

@@ @@ -7,47 +7,52 @@ @@
 #include "strings.h"
 #include "gfx.h"
 #include "viewport.h"
 #include "saveload.h"
 #include "hal.h"
 #include "console.h"
 #include "string.h"
 #include "variables.h"
 #include "table/sprites.h"
 #include <stdarg.h> /* va_list */
 #include "date.h"
 enum {
 	MAX_TEXTMESSAGE_LENGTH = 150,
 	MAX_TEXT_MESSAGES      =  30,
 	MAX_CHAT_MESSAGES      =  10,
 	MAX_ANIMATED_TILES     = 256,
 };
 typedef struct TextEffect {
 	StringID string_id;
 	int32 x;
 	int32 y;
 	int32 right;
 	int32 bottom;
 	uint16 duration;
 	uint32 params_1;
 	uint32 params_2;
 } TextEffect;
 #define MAX_TEXTMESSAGE_LENGTH 150
 typedef struct TextMessage {
 	char message[MAX_TEXTMESSAGE_LENGTH];
 	uint16 color;
 	Date end_date;
 } TextMessage;
 #define MAX_CHAT_MESSAGES 10
 static TextEffect _text_effect_list[30];
 static TextEffect _text_effect_list[MAX_TEXT_MESSAGES];
 static TextMessage _textmsg_list[MAX_CHAT_MESSAGES];
-TileIndex _animated_tile_list[256];
+TileIndex _animated_tile_list[MAX_ANIMATED_TILES];
 static bool _textmessage_dirty = false;
 static bool _textmessage_visible = false;
 /* The chatbox grows from the bottom so the coordinates are pixels from
  * the left and pixels from the bottom. The height is the maximum height */
 static const Oblong _textmsg_box = {10, 30, 500, 150};
 static Pixel _textmessage_backup[150 * 500]; // (height * width)
 extern void memcpy_pitch(void *dst, void *src, int w, int h, int srcpitch, int dstpitch);
 static inline uint GetTextMessageCount(void)
@@ @@ -104,124 +109,125 @@ void CDECL AddTextMessage(uint16 color, @@
 	_textmessage_dirty = true;
+}
 void InitTextMessage(void)
+{
 	uint i;
 	for (i = 0; i < MAX_CHAT_MESSAGES; i++) {
 		_textmsg_list[i].message[0] = '\0';
+	}
+}
-// Hide the textbox
+/* Hide the textbox */
 void UndrawTextMessage(void)
+{
 	if (_textmessage_visible) {
 		// Sometimes we also need to hide the cursor
 		//   This is because both textmessage and the cursor take a shot of the
 		//   screen before drawing.
 		//   Now the textmessage takes his shot and paints his data before the cursor
 		//   does, so in the shot of the cursor is the screen-data of the textmessage
 		//   included when the cursor hangs somewhere over the textmessage. To
 		//   avoid wrong repaints, we undraw the cursor in that case, and everything
 		//   looks nicely ;)
 		// (and now hope this story above makes sense to you ;))
 		/* Sometimes we also need to hide the cursor
 		 *   This is because both textmessage and the cursor take a shot of the
 		 *   screen before drawing.
 		 *   Now the textmessage takes his shot and paints his data before the cursor
 		 *   does, so in the shot of the cursor is the screen-data of the textmessage
 		 *   included when the cursor hangs somewhere over the textmessage. To
 		 *   avoid wrong repaints, we undraw the cursor in that case, and everything
 		 *   looks nicely ;)
 		 * (and now hope this story above makes sense to you ;))
 		 */
 		if (_cursor.visible) {
 			if (_cursor.draw_pos.x + _cursor.draw_size.x >= _textmsg_box.x &&
 				_cursor.draw_pos.x <= _textmsg_box.x + _textmsg_box.width &&
 				_cursor.draw_pos.y + _cursor.draw_size.y >= _screen.height - _textmsg_box.y - _textmsg_box.height &&
 				_cursor.draw_pos.y <= _screen.height - _textmsg_box.y) {
 				UndrawMouseCursor();
+			}
+		}
 		_textmessage_visible = false;
-		// Put our 'shot' back to the screen
+		/* Put our 'shot' back to the screen */
 		memcpy_pitch(
 			_screen.dst_ptr + _textmsg_box.x + (_screen.height - _textmsg_box.y - _textmsg_box.height) * _screen.pitch,
 			_textmessage_backup,
 			_textmsg_box.width, _textmsg_box.height, _textmsg_box.width, _screen.pitch);
-		// And make sure it is updated next time
+		/* And make sure it is updated next time */
 		_video_driver->make_dirty(_textmsg_box.x, _screen.height - _textmsg_box.y - _textmsg_box.height, _textmsg_box.width, _textmsg_box.height);
 		_textmessage_dirty = true;
+	}
+}
-// Check if a message is expired every day
+/* Check if a message is expired every day */
 void TextMessageDailyLoop(void)
+{
 	uint i;
 	for (i = 0; i < MAX_CHAT_MESSAGES; i++) {
 		TextMessage *tmsg = &_textmsg_list[i];
 		if (tmsg->message[0] == '\0') continue;
 		/* Message has expired, remove from the list */
 		if (tmsg->end_date < _date) {
 			/* Move the remaining messages over the current message */
 			if (i != MAX_CHAT_MESSAGES - 1) memmove(tmsg, tmsg + 1, sizeof(*tmsg) * (MAX_CHAT_MESSAGES - i - 1));
 			/* Mark the last item as empty */
 			_textmsg_list[MAX_CHAT_MESSAGES - 1].message[0] = '\0';
 			_textmessage_dirty = true;
 			/* Go one item back, because we moved the array 1 to the left */
 			i--;
+		}
+	}
+}
-// Draw the textmessage-box
+/* Draw the textmessage-box */
 void DrawTextMessage(void)
+{
 	uint y, count;
 	if (!_textmessage_dirty) return;
-	// First undraw if needed
+	/* First undraw if needed */
 	UndrawTextMessage();
 	if (_iconsole_mode == ICONSOLE_FULL) return;
 	/* Check if we have anything to draw at all */
 	count = GetTextMessageCount();
 	if (count == 0) return;
-	// Make a copy of the screen as it is before painting (for undraw)
+	/* Make a copy of the screen as it is before painting (for undraw) */
 	memcpy_pitch(
 		_textmessage_backup,
 		_screen.dst_ptr + _textmsg_box.x + (_screen.height - _textmsg_box.y - _textmsg_box.height) * _screen.pitch,
 		_textmsg_box.width, _textmsg_box.height, _screen.pitch, _textmsg_box.width);
 	_cur_dpi = &_screen; // switch to _screen painting
 	/* Paint a half-transparent box behind the text messages */
 	GfxFillRect(
 			_textmsg_box.x,
 			_screen.height - _textmsg_box.y - count * 13 - 2,
 			_textmsg_box.x + _textmsg_box.width - 1,
 			_screen.height - _textmsg_box.y - 2,
 x322 | USE_COLORTABLE // black, but with some alpha for background
 		);
 	/* Paint the messages starting with the lowest at the bottom */
 	for (y = 13; count-- != 0; y += 13) {
 		DoDrawString(_textmsg_list[count].message, _textmsg_box.x + 3, _screen.height - _textmsg_box.y - y + 1, _textmsg_list[count].color);
+ 	}
-	// Make sure the data is updated next flush
+	/* Make sure the data is updated next flush */
 	_video_driver->make_dirty(_textmsg_box.x, _screen.height - _textmsg_box.y - _textmsg_box.height, _textmsg_box.width, _textmsg_box.height);
 	_textmessage_visible = true;
 	_textmessage_dirty = false;
+}
 static void MarkTextEffectAreaDirty(TextEffect *te)
+{
 	MarkAllViewportsDirty(
 		te->x,
 		te->y - 1,
 		(te->right - te->x)*2 + te->x + 1,
@@ @@ -310,41 +316,41 @@ void DrawTextEffects(DrawPixelInfo *dpi) @@
 						dpi->top  <= te->bottom * 2 - te->y &&
 						dpi->left + dpi->width  > te->x &&
 						dpi->top  + dpi->height > te->y) {
 					AddStringToDraw(te->x, te->y, (StringID)(te->string_id-1), te->params_1, te->params_2);
+				}
+			}
 			break;
+	}
+}
 void DeleteAnimatedTile(TileIndex tile)
+{
-	TileIndex* ti;
+	TileIndex *ti;
 	for (ti = _animated_tile_list; ti != endof(_animated_tile_list); ti++) {
 		if (tile == *ti) {
 			/* remove the hole */
-			memmove(ti, ti + 1, (lastof(_animated_tile_list) - ti) * sizeof(_animated_tile_list[0]));
+			memmove(ti, ti + 1, (lastof(_animated_tile_list) - ti) * sizeof(*ti));
 			/* and clear last item */
-			endof(_animated_tile_list)[-1] = 0;
+			*lastof(_animated_tile_list) = 0;
 			MarkTileDirtyByTile(tile);
 			return;
+		}
+	}
+}
 bool AddAnimatedTile(TileIndex tile)
+{
-	TileIndex* ti;
+	TileIndex *ti;
 	for (ti = _animated_tile_list; ti != endof(_animated_tile_list); ti++) {
 		if (tile == *ti || *ti == 0) {
 			*ti = tile;
 			MarkTileDirtyByTile(tile);
 			return true;
+		}
+	}
 	return false;
+}
@@ @@ -355,24 +361,24 @@ void AnimateAnimatedTiles(void) @@
 	for (ti = _animated_tile_list; ti != endof(_animated_tile_list) && *ti != 0; ti++) {
 		AnimateTile(*ti);
+	}
+}
 void InitializeAnimatedTiles(void)
+{
 	memset(_animated_tile_list, 0, sizeof(_animated_tile_list));
+}
 static void SaveLoad_ANIT(void)
+{
-	// In pre version 6, we has 16bit per tile, now we have 32bit per tile, convert it ;)
+	/* In pre version 6, we has 16bit per tile, now we have 32bit per tile, convert it ;) */
 	if (CheckSavegameVersion(6)) {
 		SlArray(_animated_tile_list, lengthof(_animated_tile_list), SLE_FILE_U16 | SLE_VAR_U32);
 	} else {
 		SlArray(_animated_tile_list, lengthof(_animated_tile_list), SLE_UINT32);
+	}
+}
 const ChunkHandler _animated_tile_chunk_handlers[] = {
 	{ 'ANIT', SaveLoad_ANIT, SaveLoad_ANIT, CH_RIFF | CH_LAST},
 };

0 comments (0 inline, 0 general)