4 files changed, 10 insertions, 14 deletions
diff --git a/src/core/main.h b/src/core/main.h
index 9ad4ed1c..96fbef05 100644
--- a/src/core/main.h
+++ b/src/core/main.h
@@ -20,6 +20,9 @@ extern bool gbShowTimebars;
 
 class CSprite2d;
 
+bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+bool DoRWStuffStartOfFrame_Horizon(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
+void DoRWStuffEndOfFrame(void);
 void InitialiseGame(void);
 void LoadingScreen(const char *str1, const char *str2, const char *splashscreen);
 void LoadingIslandScreen(const char *levelName);
diff --git a/src/rw/NodeName.cpp b/src/rw/NodeName.cpp
index ad4acffb..a7185e4f 100644
--- a/src/rw/NodeName.cpp
+++ b/src/rw/NodeName.cpp
@@ -50,8 +50,8 @@ NodeNameStreamWrite(RwStream *stream, RwInt32 binaryLength, const void *object,
 RwInt32
 NodeNameStreamGetSize(const void *object, RwInt32 offsetInObject, RwInt32 sizeInObject)
 {
-	// game checks for null pointer on node name extension but that really happen
-	return (RwInt32)rwstrlen(NODENAMEEXT(object));
+	char *name = NODENAMEEXT(object);	// can't be nil
+	return name ? (RwInt32)rwstrlen(name) : 0;
 }
 
 bool
diff --git a/src/rw/TexRead.cpp b/src/rw/TexRead.cpp
index 0ef260b1..33d9a4cb 100644
--- a/src/rw/TexRead.cpp
+++ b/src/rw/TexRead.cpp
@@ -202,9 +202,6 @@ WriteVideoCardCapsFile(void)
 	}
 }
 
-bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
-void DoRWStuffEndOfFrame(void);
-
 void
 ConvertingTexturesScreen(uint32 num, uint32 count, const char *text)
 {
diff --git a/src/rw/TxdStore.cpp b/src/rw/TxdStore.cpp
index 51d018f6..a9e29729 100644
--- a/src/rw/TxdStore.cpp
+++ b/src/rw/TxdStore.cpp
@@ -58,11 +58,10 @@ CTxdStore::RemoveTxdSlot(int slot)
 int
 CTxdStore::FindTxdSlot(const char *name)
 {
-	char *defname;
 	int size = ms_pTxdPool->GetSize();
 	for(int i = 0; i < size; i++){
-		defname = GetTxdName(i);
-		if(defname && !CGeneral::faststricmp(defname, name))
+		TxdDef *def = GetSlot(i);
+		if(def && !CGeneral::faststricmp(def->name, name))
 			return i;
 	}
 	return -1;
@@ -71,8 +70,7 @@ CTxdStore::FindTxdSlot(const char *name)
 char*
 CTxdStore::GetTxdName(int slot)
 {
-	TxdDef *def = GetSlot(slot);
-	return def ? def->name : nil;
+	return GetSlot(slot)->name;
 }
 
 void
@@ -91,9 +89,7 @@ CTxdStore::PopCurrentTxd(void)
 void
 CTxdStore::SetCurrentTxd(int slot)
 {
-	TxdDef *def = GetSlot(slot);
-	if(def)
-		RwTexDictionarySetCurrent(def->texDict);
+	RwTexDictionarySetCurrent(GetSlot(slot)->texDict);
 }
 
 void
@@ -118,7 +114,7 @@ void
 CTxdStore::RemoveRef(int slot)
 {
 	if(--GetSlot(slot)->refCount <= 0)
-		CStreaming::RemoveModel(slot + STREAM_OFFSET_TXD);
+		CStreaming::RemoveTxd(slot);
 }
 
 void