From 69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e Mon Sep 17 00:00:00 2001
From: strangerke
Date: Thu, 12 May 2011 01:13:57 +0200
Subject: GIT: Clean up: Suppress SVN tags, now useless

---
 engines/sword2/render.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'engines/sword2/render.cpp')

diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp
index a47f8abe0d..e3bce7d27f 100644
--- a/engines/sword2/render.cpp
+++ b/engines/sword2/render.cpp
@@ -20,9 +20,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
  */
 
 
-- 
cgit v1.2.3


From 9539017ee35ce280758f22e589aa52c3baf9aaf3 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Wed, 25 May 2011 11:17:11 -0400
Subject: ALL: initialise -> initialize

---
 engines/sword2/render.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'engines/sword2/render.cpp')

diff --git a/engines/sword2/render.cpp b/engines/sword2/render.cpp
index e3bce7d27f..1e068d6061 100644
--- a/engines/sword2/render.cpp
+++ b/engines/sword2/render.cpp
@@ -342,10 +342,10 @@ void Screen::renderParallax(byte *ptr, int16 l) {
 #define LIMIT_FRAME_RATE
 
 /**
- * Initialises the timers before the render loop is entered.
+ * Initializes the timers before the render loop is entered.
  */
 
-void Screen::initialiseRenderCycle() {
+void Screen::initializeRenderCycle() {
 	_initialTime = _vm->_system->getMillis();
 	_totalTime = _initialTime + (1000 / _vm->getFramesPerSecond());
 }
@@ -399,7 +399,7 @@ bool Screen::endRenderCycle() {
 		renderCountIndex = 0;
 
 	if (_renderTooSlow) {
-		initialiseRenderCycle();
+		initializeRenderCycle();
 		return true;
 	}
 
@@ -461,13 +461,13 @@ void Screen::resetRenderEngine() {
  * or a NULL pointer in order of background parallax to foreground parallax.
  */
 
-int32 Screen::initialiseBackgroundLayer(byte *parallax) {
+int32 Screen::initializeBackgroundLayer(byte *parallax) {
 	Parallax p;
 	uint16 i, j, k;
 	byte *data;
 	byte *dst;
 
-	debug(2, "initialiseBackgroundLayer");
+	debug(2, "initializeBackgroundLayer");
 
 	assert(_layer < MAXLAYERS);
 
@@ -588,14 +588,14 @@ int32 Screen::initialiseBackgroundLayer(byte *parallax) {
  * ratio correction), while PC backgrounds are in tiles of 64x64.
  */
 
-int32 Screen::initialisePsxBackgroundLayer(byte *parallax) {
+int32 Screen::initializePsxBackgroundLayer(byte *parallax) {
 	uint16 bgXres, bgYres;
 	uint16 trueXres, stripeNumber, totStripes;
 	uint32 baseAddress, stripePos;
 	uint16 i, j;
 	byte *dst;
 
-	debug(2, "initialisePsxBackgroundLayer");
+	debug(2, "initializePsxBackgroundLayer");
 
 	assert(_layer < MAXLAYERS);
 
@@ -698,14 +698,14 @@ int32 Screen::initialisePsxBackgroundLayer(byte *parallax) {
  * can be understood by renderParallax functions.
  */
 
-int32 Screen::initialisePsxParallaxLayer(byte *parallax) {
+int32 Screen::initializePsxParallaxLayer(byte *parallax) {
 	uint16 plxXres, plxYres;
 	uint16 xTiles, yTiles;
 	uint16 i, j, k;
 	byte *data;
 	byte *dst;
 
-	debug(2, "initialisePsxParallaxLayer");
+	debug(2, "initializePsxParallaxLayer");
 
 	assert(_layer < MAXLAYERS);
 
-- 
cgit v1.2.3