[Scummvm-cvs-logs] scummvm master -> 364bc93918c2e21c9b45c6229e2dbae1487f4a18

dreammaster dreammaster at scummvm.org
Tue Dec 27 10:25:27 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
364bc93918 TSAGE: Change R2R AUTODOC_ITEMS to truly be a constant array.


Commit: 364bc93918c2e21c9b45c6229e2dbae1487f4a18
    https://github.com/scummvm/scummvm/commit/364bc93918c2e21c9b45c6229e2dbae1487f4a18
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-12-27T01:24:53-08:00

Commit Message:
TSAGE: Change R2R AUTODOC_ITEMS to truly be a constant array.

Hopefully this will stop it being a globally constructed object.

Changed paths:
    engines/tsage/staticres.cpp
    engines/tsage/staticres.h



diff --git a/engines/tsage/staticres.cpp b/engines/tsage/staticres.cpp
index 3be7198..c7ec1c5 100644
--- a/engines/tsage/staticres.cpp
+++ b/engines/tsage/staticres.cpp
@@ -205,7 +205,7 @@ const char *ACCESS_CODE_REQUIRED = "access code required";
 const char *INVALID_ACCESS_CODE = "invalid access code";
 const char *FOREIGN_OBJECT_EXTRACTED = "foreign object extracted";
 
-const char *AUTODOC_ITEMS[11] = { 
+const char *const AUTODOC_ITEMS[11] = { 
 	MAIN_MENU, DIAGNOSIS, ADVANCED_PROCEDURES, VITAL_SIGNS, OPEN_DOOR, TREATMENTS,
 	NO_MALADY_DETECTED, NO_TREATMENT_REQUIRED, ACCESS_CODE_REQUIRED, INVALID_ACCESS_CODE,
 	FOREIGN_OBJECT_EXTRACTED
diff --git a/engines/tsage/staticres.h b/engines/tsage/staticres.h
index e2afb65..eee6a29 100644
--- a/engines/tsage/staticres.h
+++ b/engines/tsage/staticres.h
@@ -161,7 +161,7 @@ extern const char *NO_TREATMENT_REQUIRED;
 extern const char *ACCESS_CODE_REQUIRED;
 extern const char *INVALID_ACCESS_CODE;
 extern const char *FOREIGN_OBJECT_EXTRACTED;
-extern const char *AUTODOC_ITEMS[11];
+extern const char *const AUTODOC_ITEMS[11];
 
 // Dialog messages
 extern const char *HELP_MSG;






More information about the Scummvm-git-logs mailing list