646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
22 lines
459 B
Diff
22 lines
459 B
Diff
diff -Nru glob2-0.9.4.4/src/Game.h glob2-0.9.4.4.new/src/Game.h
|
|
--- glob2-0.9.4.4/src/Game.h 2009-08-29 16:39:06.000000000 -0400
|
|
+++ glob2-0.9.4.4.new/src/Game.h 2015-08-29 00:59:07.843398596 -0400
|
|
@@ -148,7 +148,7 @@
|
|
TOP_TO_BOTTOM,
|
|
BOTTOM_TO_TOP
|
|
};
|
|
-
|
|
+public:
|
|
struct BuildProject
|
|
{
|
|
int posX;
|
|
@@ -158,7 +158,7 @@
|
|
int unitWorking;
|
|
int unitWorkingFuture;
|
|
};
|
|
-
|
|
+private:
|
|
///Initiates Game
|
|
void init(GameGUI *gui, MapEdit* edit);
|
|
|