Merge branch 'HEAD' of git@github.com:FacialTurd/The-Powder-Toy.git

9 files changed, 17 insertions, 7 deletions

diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index 1a2f296..367aa70 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -949,6 +949,8 @@ void Client::MoveStampToFront(std::string stampID)
 SaveFile * Client::GetStamp(std::string stampID)
 {
 	std::string stampFile = std::string(STAMPS_DIR PATH_SEP + stampID + ".stm");
+	if (!FileExists(stampFile))
+		stampFile = stampID;
 	if(FileExists(stampFile))
 	{
 		SaveFile * file = new SaveFile(stampID);
diff --git a/src/client/GameSave.cpp b/src/client/GameSave.cpp
index 06441c8..265ff27 100644
--- a/src/client/GameSave.cpp
+++ b/src/client/GameSave.cpp
@@ -947,6 +947,11 @@ void GameSave::readOPS(char * data, int dataLength)
 					case PT_PSTN:
 						if (savedVersion < 87 && particles[newIndex].ctype)
 							particles[newIndex].life = 1;
+					case PT_STKM:
+					case PT_STKM2:
+					case PT_FIGH:
+						if (savedVersion < 88 && particles[newIndex].ctype == OLD_SPC_AIR)
+							particles[newIndex].ctype = SPC_AIR;
 					}
 					newIndex++;
 				}
@@ -1566,6 +1571,9 @@ void GameSave::readPSv(char * data, int dataLength)
 					particles[i-1].ctype = (((unsigned char)(firw_data[caddress]))<<16) | (((unsigned char)(firw_data[caddress+1]))<<8) | ((unsigned char)(firw_data[caddress+2]));
 				}
 			}
+			if (ver < 88) //fix air blowing stickmen
+				if ((particles[i-1].type == PT_STKM || particles[i-1].type == PT_STKM2 || particles[i-1].type == PT_FIGH) && particles[i-1].ctype == OLD_SPC_AIR)
+					particles[i-1].ctype == SPC_AIR;
 		}
 	}
 
diff --git a/src/client/requestbroker/APIRequest.cpp b/src/client/requestbroker/APIRequest.cpp
index d94171e..10b2a8b 100644
--- a/src/client/requestbroker/APIRequest.cpp
+++ b/src/client/requestbroker/APIRequest.cpp
@@ -134,4 +134,4 @@ void APIRequest::Cleanup()
 		Parser->Cleanup(ResultObject);
 		ResultObject = NULL;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/client/requestbroker/APIResultParser.h b/src/client/requestbroker/APIResultParser.h
index 40c7512..aadfbfb 100644
--- a/src/client/requestbroker/APIResultParser.h
+++ b/src/client/requestbroker/APIResultParser.h
@@ -13,4 +13,4 @@ public:
 	virtual ~APIResultParser() { }
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/client/requestbroker/ImageRequest.cpp b/src/client/requestbroker/ImageRequest.cpp
index 778d8b6..9c8d42c 100644
--- a/src/client/requestbroker/ImageRequest.cpp
+++ b/src/client/requestbroker/ImageRequest.cpp
@@ -147,4 +147,4 @@ void ImageRequest::Cleanup()
 		delete ((VideoBuffer*)ResultObject);
 		ResultObject = NULL;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/client/requestbroker/ImageRequest.h b/src/client/requestbroker/ImageRequest.h
index 9a2cf34..2fc0b62 100644
--- a/src/client/requestbroker/ImageRequest.h
+++ b/src/client/requestbroker/ImageRequest.h
@@ -11,4 +11,4 @@ public:
 	virtual RequestBroker::ProcessResponse Process(RequestBroker & rb);
 	virtual ~ImageRequest();
 	virtual void Cleanup();
-};
\ No newline at end of file
+};
diff --git a/src/client/requestbroker/RequestBroker.cpp b/src/client/requestbroker/RequestBroker.cpp
index cfa1294..17ee1cc 100644
--- a/src/client/requestbroker/RequestBroker.cpp
+++ b/src/client/requestbroker/RequestBroker.cpp
@@ -309,4 +309,4 @@ void RequestBroker::Request::Cleanup()
 		(*iter)->Cleanup();
 		iter++;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/client/requestbroker/RequestBroker.h b/src/client/requestbroker/RequestBroker.h
index 4c31e89..f6454a9 100644
--- a/src/client/requestbroker/RequestBroker.h
+++ b/src/client/requestbroker/RequestBroker.h
@@ -75,4 +75,4 @@ public:
 		virtual ~Request();
 		virtual void Cleanup();
 	};
-};
\ No newline at end of file
+};
diff --git a/src/client/requestbroker/ThumbRenderRequest.cpp b/src/client/requestbroker/ThumbRenderRequest.cpp
index 3601401..1b38529 100644
--- a/src/client/requestbroker/ThumbRenderRequest.cpp
+++ b/src/client/requestbroker/ThumbRenderRequest.cpp
@@ -50,4 +50,4 @@ void ThumbRenderRequest::Cleanup()
 		delete ((VideoBuffer*)ResultObject);
 		ResultObject = NULL;
 	}
-}
\ No newline at end of file
+}