Add cm_ prefix to all citymania source files

src/citymania/cm_base64.cpp

@@ -1,4 +1,4 @@
-/* 
+/*
    base64.cpp and base64.h
 
    Copyright (C) 2004-2008 René Nyffenegger
@@ -25,10 +25,10 @@
 
 */
 
-#include "base64.h"
+#include "cm_base64.hpp"
 #include <iostream>
 
-static const std::string base64_chars = 
+static const std::string base64_chars =
              "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
              "abcdefghijklmnopqrstuvwxyz"
              "0123456789+/";
@@ -142,10 +142,10 @@ int main2() {
 	fclose(fp);
 
   std::string encoded = base64_encode((unsigned char*)mFileBuffer, mFileLen);//reinterpret_cast<const unsigned char*>(s.c_str()), s.length());
- 
+
   {
   FILE* fileWrite = fopen("d:/PhysicsAnimationBakingDemo.uue64.h","w");
-  
+
   fprintf(fileWrite,"const char* mydata_base64 = {\n");
 	int counter = 0;
 	for (int i=0;i<encoded.size();i++)

src/citymania/cm_base64.hpp

@@ -1,5 +1,5 @@
-#ifndef BASE_64_H
-#define BASE_64_H
+#ifndef CM_BASE64_HPP
+#define CM_BASE64_HPP
 
 #include <string>
 

src/citymania/cm_highlight.cpp

@@ -1,6 +1,8 @@
 #include "../stdafx.h"
 
-#include "highlight.hpp"
+#include "cm_highlight.hpp"
+#include "cm_main.hpp"
+#include "cm_station_gui.hpp"
 
 #include "../core/math_func.hpp"
 #include "../command_func.h"
@@ -16,10 +18,6 @@
 
 #include <set>
 
-#include "station_ui.hpp"
-
-#include "cm_main.hpp"
-
 
 /** Enumeration of multi-part foundations */
 enum FoundationPart {

src/citymania/cm_locations.cpp

@@ -7,7 +7,7 @@
 #include "../zoom_func.h"
 #include "../zoom_type.h"
 
-#include "locations.hpp"
+#include "cm_locations.hpp"
 
 #include "../safeguards.h"
 

src/citymania/cm_locations.hpp

@@ -1,5 +1,5 @@
-#ifndef CITYMANIA_LOCATIONS_HPP
-#define CITYMANIA_LOCATIONS_HPP
+#ifndef CM_LOCATIONS_HPP
+#define CM_LOCATIONS_HPP
 
 namespace citymania {
 

src/citymania/cm_minimap.cpp

@@ -1,6 +1,6 @@
 #include "../stdafx.h"
 
-#include "minimap.hpp"
+#include "cm_minimap.hpp"
 
 #include "../safeguards.h"
 

src/citymania/cm_minimap.hpp

@@ -1,5 +1,5 @@
-#ifndef CITYMANIA_MINIMAP_HPP
-#define CITYMANIA_MINIMAP_HPP
+#ifndef CM_MINIMAP_HPP
+#define CM_MINIMAP_HPP
 
 #include "../core/endian_func.hpp"
 

src/citymania/cm_station_gui.cpp

@@ -1,6 +1,6 @@
 #include "../stdafx.h"
 
-#include "station_ui.hpp"
+#include "cm_station_gui.hpp"
 
 #include "cm_hotkeys.hpp"
 

src/citymania/cm_station_gui.hpp

@@ -1,5 +1,5 @@
-#ifndef CITYMANIA_STATION_UI_HPP
-#define CITYMANIA_STATION_UI_HPP
+#ifndef CM_STATION_GUI_HPP
+#define CM_STATION_GUI_HPP
 
 #include "../core/geometry_type.hpp"
 #include "../command_type.h"

src/commands_gui.cpp

@@ -18,7 +18,7 @@
 #include "window_func.h"
 #include "window_gui.h"
 
-#include "citymania/base64.h"
+#include "citymania/cm_base64.hpp"
 
 
 bool _novahost = false;

src/dock_gui.cpp

@@ -32,7 +32,7 @@
 #include "table/strings.h"
 
 #include "citymania/cm_hotkeys.hpp"
-#include "citymania/station_ui.hpp"
+#include "citymania/cm_station_gui.hpp"
 
 #include "safeguards.h"
 

src/map.cpp

@@ -12,7 +12,7 @@
 #include "core/alloc_func.hpp"
 #include "water_map.h"
 #include "string_func.h"
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 
 #include "safeguards.h"
 

src/openttd.cpp

@@ -68,7 +68,7 @@
 
 #include "linkgraph/linkgraphschedule.h"
 
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 #include "citymania/cm_main.hpp"
 
 #include <stdarg.h>

src/road_gui.cpp

@@ -40,7 +40,7 @@
 #include "table/strings.h"
 
 #include "citymania/cm_hotkeys.hpp"
-#include "citymania/station_ui.hpp"
+#include "citymania/cm_station_gui.hpp"
 
 #include "safeguards.h"
 

src/saveload/afterload.cpp

@@ -61,7 +61,7 @@
 #include "../game/game_text.hpp"
 #include "../table/control_codes.h"
 
-#include "../citymania/highlight.hpp"
+#include "../citymania/cm_highlight.hpp"
 
 #include "saveload_internal.h"
 

src/smallmap_gui.cpp

@@ -30,7 +30,7 @@
 #include <bitset>
 
 #include "citymania/cm_hotkeys.hpp"
-#include "citymania/minimap.hpp"
+#include "citymania/cm_minimap.hpp"
 
 #include "safeguards.h"
 

src/station_cmd.cpp

@@ -59,7 +59,7 @@
 
 #include "table/strings.h"
 
-#include "citymania/station_ui.hpp"
+#include "citymania/cm_station_gui.hpp"
 
 #include "safeguards.h"
 

src/station_gui.cpp

@@ -39,8 +39,8 @@
 #include <set>
 #include <vector>
 
-#include "citymania/station_ui.hpp"
 #include "citymania/cm_hotkeys.hpp"
+#include "citymania/cm_station_gui.hpp"
 #include "citymania/cm_tooltips.hpp"
 
 #include "safeguards.h"

src/toolbar_gui.cpp

@@ -60,7 +60,7 @@
 #include "zoning.h"
 #include "watch_gui.h"
 
-#include "citymania/locations.hpp"
+#include "citymania/cm_locations.hpp"
 #include "citymania/cm_main.hpp"
 
 #include "safeguards.h"

src/town_cmd.cpp

@@ -52,7 +52,7 @@
 #include "table/strings.h"
 #include "table/town_land.h"
 
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 #include "citymania/cm_main.hpp"
 
 #include "safeguards.h"

src/tree_cmd.cpp

@@ -27,7 +27,7 @@
 #include "table/tree_land.h"
 #include "table/clear_land.h"
 
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 
 #include "safeguards.h"
 

src/viewport.cpp

@@ -101,7 +101,7 @@
 #include "zoning.h"
 #include "industry_type.h"
 
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 #include "citymania/cm_hotkeys.hpp"
 
 #include "safeguards.h"

src/zoning_cmd.cpp

@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <vector>
 
-#include "citymania/highlight.hpp"
+#include "citymania/cm_highlight.hpp"
 #include "citymania/cm_game.hpp"
 #include "citymania/cm_main.hpp"