From a2a6f29ab3a5a741a2fe2b530655be440dde9e8b Mon Sep 17 00:00:00 2001 From: Ykkrosh Date: Sun, 5 Dec 2004 21:56:09 +0000 Subject: [PATCH] s/Prometheus/Pyrogenesis/ This was SVN commit r1459. --- source/graphics/GameView.cpp | 2 +- source/gui/CGUI.cpp | 4 ++-- source/gui/GUI.h | 2 +- source/lib/sysdep/win/wdbg.cpp | 8 ++++---- source/maths/MathUtil.h | 2 +- source/maths/scripting/JSInterface_Vector3D.h | 2 +- source/ps/CConsole.cpp | 2 +- source/ps/CStr.h | 2 +- source/ps/ConfigDB.cpp | 2 +- source/ps/ConfigDB.h | 2 +- source/ps/Encryption.h | 2 +- source/ps/Error.h | 2 +- source/ps/LogFile.h | 2 +- source/ps/Network/Network.h | 2 +- source/ps/Network/SocketBase.h | 2 +- source/ps/Network/StreamSocket.h | 2 +- source/ps/Parser.h | 2 +- source/ps/{Prometheus.cpp => Pyrogenesis.cpp} | 2 +- source/ps/{Prometheus.h => Pyrogenesis.h} | 6 +++--- source/ps/XercesErrorHandler.cpp | 4 ++-- source/ps/XercesErrorHandler.h | 6 +++--- source/simulation/BaseEntity.h | 2 +- 22 files changed, 31 insertions(+), 31 deletions(-) rename source/ps/{Prometheus.cpp => Pyrogenesis.cpp} (77%) rename source/ps/{Prometheus.h => Pyrogenesis.h} (82%) diff --git a/source/graphics/GameView.cpp b/source/graphics/GameView.cpp index d0b689ebf2..70f878bc01 100755 --- a/source/graphics/GameView.cpp +++ b/source/graphics/GameView.cpp @@ -13,7 +13,7 @@ #include "HFTracer.h" #include "TextureManager.h" #include "ObjectManager.h" -#include "Prometheus.h" +#include "Pyrogenesis.h" #include "Hotkey.h" #include "ConfigDB.h" diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp index 33c27e4b25..ea30d0dab9 100755 --- a/source/gui/CGUI.cpp +++ b/source/gui/CGUI.cpp @@ -27,7 +27,7 @@ gee@pyro.nu #include "ps/Xeromyces.h" #include "ps/Font.h" -#include "Prometheus.h" +#include "Pyrogenesis.h" #include "input.h" #include "OverlayText.h" // TODO Gee: Whatever include CRect/CPos/CSize @@ -296,7 +296,7 @@ void CGUI::Initialize() { // Add base types! // You can also add types outside the GUI to extend the flexibility of the GUI. - // Prometheus though will have all the object types inserted from here. + // Pyrogenesis though will have all the object types inserted from here. AddObjectType("empty", &CGUIDummyObject::ConstructObject); AddObjectType("button", &CButton::ConstructObject); AddObjectType("image", &CImage::ConstructObject); diff --git a/source/gui/GUI.h b/source/gui/GUI.h index fe23f4fa6d..a185ac56f1 100755 --- a/source/gui/GUI.h +++ b/source/gui/GUI.h @@ -33,7 +33,7 @@ gee@pyro.nu #include #include -#include "Prometheus.h" +#include "Pyrogenesis.h" #include "CStr.h" #include "types.h" #include "ogl.h" diff --git a/source/lib/sysdep/win/wdbg.cpp b/source/lib/sysdep/win/wdbg.cpp index 7b5eb40bfa..5f7834b85d 100755 --- a/source/lib/sysdep/win/wdbg.cpp +++ b/source/lib/sysdep/win/wdbg.cpp @@ -718,7 +718,7 @@ static void set_exception_handler() // Split this into a separate function because destructors and __try don't mix void i18n_display_fatal_msg(const wchar_t* errortext) { - CStrW title = translate(L"Prometheus Failure"); + CStrW title = translate(L"Pyrogenesis Failure"); CStrW message = translate(L"A fatal error has occurred: $msg. Please report this to http://bugs.wildfiregames.com/ and attach the crashlog.txt and crashlog.dmp files from your 'data' folder.") << I18n::Raw(errortext); wdisplay_msg(title.c_str(), message.c_str()); } @@ -845,7 +845,7 @@ int debug_main_exception_filter(unsigned int UNUSEDPARAM(code), PEXCEPTION_POINT swprintf(message, 1024, L"A fatal error has occurred: %ls.\nPlease report this to http://bugs.wildfiregames.com/ and attach the crashlog.txt and crashlog.dmp files from your 'data' folder.", errortext); message[1023] = 0; - wdisplay_msg(L"Prometheus failure", message); + wdisplay_msg(L"Pyrogenesis failure", message); } @@ -855,7 +855,7 @@ int debug_main_exception_filter(unsigned int UNUSEDPARAM(code), PEXCEPTION_POINT } __except (EXCEPTION_EXECUTE_HANDLER) { - wdisplay_msg(L"Prometheus failure", L"Error generating crash log."); + wdisplay_msg(L"Pyrogenesis failure", L"Error generating crash log."); } __try @@ -867,7 +867,7 @@ int debug_main_exception_filter(unsigned int UNUSEDPARAM(code), PEXCEPTION_POINT } __except (EXCEPTION_EXECUTE_HANDLER) { - wdisplay_msg(L"Prometheus failure", L"Error generating crash dump."); + wdisplay_msg(L"Pyrogenesis failure", L"Error generating crash dump."); } // Disable memory-leak reporting, because it's going to diff --git a/source/maths/MathUtil.h b/source/maths/MathUtil.h index 8d9f54c1ac..fe6dac1cf8 100755 --- a/source/maths/MathUtil.h +++ b/source/maths/MathUtil.h @@ -50,7 +50,7 @@ recondite_phreak@yahool.com // Includes / Compiler directives //-------------------------------------------------------- -#include "Prometheus.h" // Standard Engine Include +#include "Pyrogenesis.h" // Standard Engine Include #include // Needed for fmod() //-------------------------------------------------------- diff --git a/source/maths/scripting/JSInterface_Vector3D.h b/source/maths/scripting/JSInterface_Vector3D.h index ca5b8a0add..e537c73618 100755 --- a/source/maths/scripting/JSInterface_Vector3D.h +++ b/source/maths/scripting/JSInterface_Vector3D.h @@ -1,7 +1,7 @@ // JSInterface_Entity.h // // -// A JavaScript class representing a Prometheus CVector3D object. +// A JavaScript class representing a Pyrogenesis CVector3D object. // // Usage: Used when manipulating objects of class 'Vector3D' in JavaScript. // diff --git a/source/ps/CConsole.cpp b/source/ps/CConsole.cpp index fcd9bc3390..4b146c1e87 100755 --- a/source/ps/CConsole.cpp +++ b/source/ps/CConsole.cpp @@ -4,7 +4,7 @@ #include "CConsole.h" #include "CLogger.h" -#include "Prometheus.h" +#include "Pyrogenesis.h" #include "sysdep/sysdep.h" #include "input.h" #include "Hotkey.h" diff --git a/source/ps/CStr.h b/source/ps/CStr.h index 09fdaaf0a1..13b1fb74e8 100755 --- a/source/ps/CStr.h +++ b/source/ps/CStr.h @@ -50,7 +50,7 @@ enum PS_TRIM_MODE { PS_TRIM_LEFT, PS_TRIM_RIGHT, PS_TRIM_BOTH }; #if !defined(CSTR_H) || defined(IN_UNIDOUBLER) #define CSTR_H -#include "Prometheus.h" +#include "Pyrogenesis.h" #include // Used for basic string functionality #include #include "ps/utf16string.h" diff --git a/source/ps/ConfigDB.cpp b/source/ps/ConfigDB.cpp index 12fb4290e4..d9d9d1d38a 100755 --- a/source/ps/ConfigDB.cpp +++ b/source/ps/ConfigDB.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" -#include "Prometheus.h" +#include "Pyrogenesis.h" #include "Parser.h" #include "ConfigDB.h" #include "CLogger.h" diff --git a/source/ps/ConfigDB.h b/source/ps/ConfigDB.h index b4dcda1443..ccaae435ca 100755 --- a/source/ps/ConfigDB.h +++ b/source/ps/ConfigDB.h @@ -33,7 +33,7 @@ #ifndef _ps_ConfigDB_H #define _ps_ConfigDB_H -#include "Prometheus.h" +#include "Pyrogenesis.h" #include "Parser.h" #include "CStr.h" #include "Singleton.h" diff --git a/source/ps/Encryption.h b/source/ps/Encryption.h index ee5856d329..1f9e25b518 100755 --- a/source/ps/Encryption.h +++ b/source/ps/Encryption.h @@ -16,7 +16,7 @@ There may be a better way to do this but this looks alright to me. */ -#include "Prometheus.h" +#include "Pyrogenesis.h" #ifndef ENCRYPTION_H #define ENCRYPTION_H diff --git a/source/ps/Error.h b/source/ps/Error.h index 1fb0d0abb0..d8df15e49e 100755 --- a/source/ps/Error.h +++ b/source/ps/Error.h @@ -18,7 +18,7 @@ #include "Singleton.h" -#include "Prometheus.h" +#include "Pyrogenesis.h" #include diff --git a/source/ps/LogFile.h b/source/ps/LogFile.h index 0af6db32eb..bff29e0c18 100755 --- a/source/ps/LogFile.h +++ b/source/ps/LogFile.h @@ -28,7 +28,7 @@ mark@markdellis.co.uk // Includes / Compiler directives //-------------------------------------------------------- -#include "Prometheus.h" +#include "Pyrogenesis.h" #include #include diff --git a/source/ps/Network/Network.h b/source/ps/Network/Network.h index 181c0f3b07..3f9e34c9b9 100755 --- a/source/ps/Network/Network.h +++ b/source/ps/Network/Network.h @@ -47,7 +47,7 @@ MORE INFO #include "posix.h" #include "types.h" -#include "Prometheus.h" +#include "Pyrogenesis.h" #include "ThreadUtil.h" #include "Singleton.h" diff --git a/source/ps/Network/SocketBase.h b/source/ps/Network/SocketBase.h index a1ffd36639..ad7d41d846 100755 --- a/source/ps/Network/SocketBase.h +++ b/source/ps/Network/SocketBase.h @@ -7,7 +7,7 @@ #include "posix.h" #include "types.h" -#include "Prometheus.h" +#include "Pyrogenesis.h" #include #include "CStr.h" diff --git a/source/ps/Network/StreamSocket.h b/source/ps/Network/StreamSocket.h index 2a138cf92f..e2af1289fa 100755 --- a/source/ps/Network/StreamSocket.h +++ b/source/ps/Network/StreamSocket.h @@ -2,7 +2,7 @@ #define _StreamSocket_H #include "types.h" -#include "Prometheus.h" +#include "Pyrogenesis.h" #include "Network.h" #include "SocketBase.h" diff --git a/source/ps/Parser.h b/source/ps/Parser.h index 3e7dd0eff0..136fedb98b 100755 --- a/source/ps/Parser.h +++ b/source/ps/Parser.h @@ -25,7 +25,7 @@ will exist, and it's up to the system to figure out which one acquired. #ifndef __PARSER_H #define __PARSER_H -#include "Prometheus.h" +#include "Pyrogenesis.h" #pragma warning(disable:4786) diff --git a/source/ps/Prometheus.cpp b/source/ps/Pyrogenesis.cpp similarity index 77% rename from source/ps/Prometheus.cpp rename to source/ps/Pyrogenesis.cpp index 2e7e8943c6..66a8089f27 100755 --- a/source/ps/Prometheus.cpp +++ b/source/ps/Pyrogenesis.cpp @@ -1,6 +1,6 @@ #include "precompiled.h" -#include "Prometheus.h" +#include "Pyrogenesis.h" DEFINE_ERROR(PS_OK, "OK"); DEFINE_ERROR(PS_FAIL, "Fail"); diff --git a/source/ps/Prometheus.h b/source/ps/Pyrogenesis.h similarity index 82% rename from source/ps/Prometheus.h rename to source/ps/Pyrogenesis.h index 296d07bdac..4cb34fb591 100755 --- a/source/ps/Prometheus.h +++ b/source/ps/Pyrogenesis.h @@ -1,13 +1,13 @@ /* -Prometheus.h +Pyrogenesis.h by Raj Sharma rsharma@uiuc.edu Standard declarations which are included in all projects. */ -#ifndef PROMETHEUS_H -#define PROMETHEUS_H +#ifndef PYROGENESIS_H +#define PYROGENESIS_H typedef const char * PS_RESULT; diff --git a/source/ps/XercesErrorHandler.cpp b/source/ps/XercesErrorHandler.cpp index d5662ecd5f..1c98ed448a 100755 --- a/source/ps/XercesErrorHandler.cpp +++ b/source/ps/XercesErrorHandler.cpp @@ -1,5 +1,5 @@ /* -Xerces Error Handler for Prometheus (and the GUI) +Xerces Error Handler for Pyrogenesis (and the GUI) by Gustav Larsson gee@pyro.nu */ @@ -14,7 +14,7 @@ gee@pyro.nu #include #include #include -#include "Prometheus.h" +#include "Pyrogenesis.h" #include "CLogger.h" #define LOG_CATEGORY "xml" diff --git a/source/ps/XercesErrorHandler.h b/source/ps/XercesErrorHandler.h index 7ae04f6b29..984bfc4940 100755 --- a/source/ps/XercesErrorHandler.h +++ b/source/ps/XercesErrorHandler.h @@ -1,5 +1,5 @@ /* -Xerces Error Handler for Prometheus (and the GUI) +Xerces Error Handler for Pyrogenesis (and the GUI) by Gustav Larsson gee@pyro.nu @@ -7,7 +7,7 @@ gee@pyro.nu This is a class that that will let us output Xerces C++ Parser errors in our own Log - or whatever, fit to Prometheus and foremost + or whatever, fit to Pyrogenesis and foremost the GUI. --More info-- @@ -28,7 +28,7 @@ gee@pyro.nu * @author Gustav Larsson * * Adapter function that catches Xerces Reading Exceptions - * and lets us output them in Prometheus CLogFile. + * and lets us output them in Pyrogenesis CLogFile. * * Used for all Xerces C++ Parser reading. * diff --git a/source/simulation/BaseEntity.h b/source/simulation/BaseEntity.h index f3ac59b463..2c7d9c4ec6 100755 --- a/source/simulation/BaseEntity.h +++ b/source/simulation/BaseEntity.h @@ -5,7 +5,7 @@ // Entity Templates // // Usage: These templates are used as the default values for entity properties. -// Due to Prometheus' data-inheritance model for these properties, +// Due to Pyrogenesis' data-inheritance model for these properties, // templates specify a base-template, then override only those properties // in that template that need to change. // Similarly, entities need only specify properties they possess that are