From 7062bb0bd7b1654567b54d55f401fa693d4ff018 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Wed, 30 Jun 2010 22:17:53 +0000
Subject: [PATCH] (svn r20040) -Codechange: some coding style + using proper
 types

---
 src/screenshot.cpp | 8 +++++---
 src/screenshot.h   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/screenshot.cpp b/src/screenshot.cpp
index b5198e2764..983c416cbd 100644
--- a/src/screenshot.cpp
+++ b/src/screenshot.cpp
@@ -482,12 +482,13 @@ static const ScreenshotFormat _screenshot_formats[] = {
 
 void InitializeScreenshotFormats()
 {
-	int i, j;
-	for (i = 0, j = 0; i != lengthof(_screenshot_formats); i++)
+	uint j = 0;
+	for (uint i = 0; i < lengthof(_screenshot_formats); i++) {
 		if (!strcmp(_screenshot_format_name, _screenshot_formats[i].extension)) {
 			j = i;
 			break;
 		}
+	}
 	_cur_screenshot_format = j;
 	_num_screenshot_formats = lengthof(_screenshot_formats);
 }
@@ -497,8 +498,9 @@ const char *GetScreenshotFormatDesc(int i)
 	return _screenshot_formats[i].name;
 }
 
-void SetScreenshotFormat(int i)
+void SetScreenshotFormat(uint i)
 {
+	assert(i < _num_screenshot_formats);
 	_cur_screenshot_format = i;
 	strecpy(_screenshot_format_name, _screenshot_formats[i].extension, lastof(_screenshot_format_name));
 }
diff --git a/src/screenshot.h b/src/screenshot.h
index 163362f558..2361dc01f5 100644
--- a/src/screenshot.h
+++ b/src/screenshot.h
@@ -15,7 +15,7 @@
 void InitializeScreenshotFormats();
 
 const char *GetScreenshotFormatDesc(int i);
-void SetScreenshotFormat(int i);
+void SetScreenshotFormat(uint i);
 
 /** Type of requested screenshot */
 enum ScreenshotType {