Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alfredo Tupone (tupone)" <tupone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-roguelike/scourge/files: scourge-0.20-gcc43.patch
Date: Fri, 29 Aug 2008 06:25:37
Message-Id: E1KYxQM-0000xW-9p@stork.gentoo.org
1 tupone 08/08/29 06:25:34
2
3 Added: scourge-0.20-gcc43.patch
4 Log:
5 Version bump to 0.20. Bug #222667
6 (Portage version: 2.1.4.4)
7
8 Revision Changes Path
9 1.1 games-roguelike/scourge/files/scourge-0.20-gcc43.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-roguelike/scourge/files/scourge-0.20-gcc43.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-roguelike/scourge/files/scourge-0.20-gcc43.patch?rev=1.1&content-type=text/plain
13
14 Index: scourge-0.20-gcc43.patch
15 ===================================================================
16 --- src/userconfiguration.cpp.old 2008-08-27 20:11:29.000000000 +0200
17 +++ src/userconfiguration.cpp 2008-08-27 20:16:05.000000000 +0200
18 @@ -1055,7 +1055,7 @@
19 }
20
21 void UserConfiguration::replaceSpaces(string& s) {
22 - replace(s.begin(), s.end(), ' ', '_');
23 + s.replace(s.begin(), s.end(), ' ', '_');
24 }
25
26 UserConfiguration::~UserConfiguration(){
27 --- src/tools/dfbooks.cpp.old 2008-08-28 20:59:56.000000000 +0200
28 +++ src/tools/dfbooks.cpp 2008-08-28 21:00:27.000000000 +0200
29 @@ -49,7 +49,7 @@
30 generalBooks.push_back(data[i]);
31 }
32
33 - std::ofstream fout( GetDataPath("%s/world/booksTEST"), std::ios::binary);
34 + std::ofstream fout( GetDataPath("%s/world/booksTEST").c_str(), std::ios::binary);
35
36 fout << "# Random texts found in books and notes.\n#\n# Key:\n# B: Book Name, rareness"
37 << "# M: Mission name (optional: from missions.txt)\n# T: multi-line text\n# \n\n"
38 --- src/tools/dfcreatures.cpp.old 2008-08-28 21:01:14.000000000 +0200
39 +++ src/tools/dfcreatures.cpp 2008-08-28 21:01:36.000000000 +0200
40 @@ -67,7 +67,7 @@
41
42 void DFCreatures::Save()
43 {
44 - std::ofstream fout( GetDataPath("%s/world/creaturesTEST"), std::ios::binary );
45 + std::ofstream fout( GetDataPath("%s/world/creaturesTEST").c_str(), std::ios::binary );
46
47 fout << "# Creatures\n"
48 << "# \n"
49 --- src/tools/dfgui.cpp.old 2008-08-28 21:02:13.000000000 +0200
50 +++ src/tools/dfgui.cpp 2008-08-28 21:02:31.000000000 +0200
51 @@ -167,7 +167,7 @@
52
53 void DFGui::Save()
54 {
55 - std::ofstream fout( GetDataPath("%s/world/guiTEST"), std::ios::binary);
56 + std::ofstream fout( GetDataPath("%s/world/guiTEST").c_str(), std::ios::binary);
57
58 fout << "# gui themes key:\n# (non-existing textures will appear as pure color)"
59 << "\n#\n# T:theme name\n# each row is either an \"element\" (like window background) or a \"color\" like a text color."
60 --- src/tools/dfmissions.cpp.old 2008-08-28 21:03:00.000000000 +0200
61 +++ src/tools/dfmissions.cpp 2008-08-28 21:03:13.000000000 +0200
62 @@ -124,7 +124,7 @@
63 else
64 generalMissions.push_back( *itr );
65 }
66 - std::ofstream fout( GetDataPath("%s/world/missionsTEST"), std::ios::binary);
67 + std::ofstream fout( GetDataPath("%s/world/missionsTEST").c_str(), std::ios::binary);
68
69 fout << "##########################################################\n"
70 << "# Templated missions\n# Key:\n# M:type,mission template name\n"
71 --- src/tools/dfskills.cpp.old 2008-08-28 21:03:48.000000000 +0200
72 +++ src/tools/dfskills.cpp 2008-08-28 21:04:01.000000000 +0200
73 @@ -44,7 +44,7 @@
74
75 void DFSkills::Save()
76 {
77 - std::ofstream fout( GetDataPath("%s/world/skillsTEST"), std::ios::binary);
78 + std::ofstream fout( GetDataPath("%s/world/skillsTEST").c_str(), std::ios::binary);
79
80 /**
81 * Possible improvement: set out skills in class sections as already done in skills.txt
82 --- src/tools/dfspells.cpp.old 2008-08-28 21:04:28.000000000 +0200
83 +++ src/tools/dfspells.cpp 2008-08-28 21:04:40.000000000 +0200
84 @@ -111,7 +111,7 @@
85
86 void DFSpells::Save()
87 {
88 - std::ofstream fout( GetDataPath("%s/world/spellsTEST"), std::ios::binary );
89 + std::ofstream fout( GetDataPath("%s/world/spellsTEST").c_str(), std::ios::binary );
90
91 fout << "#\n"
92 "# key: \n"
93 --- src/tools/dflocations.cpp.old 2008-08-28 21:05:14.000000000 +0200
94 +++ src/tools/dflocations.cpp 2008-08-28 21:05:27.000000000 +0200
95 @@ -28,7 +28,7 @@
96
97 void DFLocations::Save()
98 {
99 - std::ofstream fout( GetDataPath("%s/world/locationsTEST"), std::ios::binary);
100 + std::ofstream fout( GetDataPath("%s/world/locationsTEST").c_str(), std::ios::binary);
101
102 fout << "# Locations of relevant places on the scourge map.\n"
103 << "# Key:\n"
104 --- src/tools/dfrpg.cpp.old 2008-08-28 21:05:53.000000000 +0200
105 +++ src/tools/dfrpg.cpp 2008-08-28 21:06:10.000000000 +0200
106 @@ -150,7 +150,7 @@
107
108 void DFRpg::Save()
109 {
110 - std::ofstream fout( GetDataPath("%s/world/rpgTEST"), std::ios::binary );
111 + std::ofstream fout( GetDataPath("%s/world/rpgTEST").c_str(), std::ios::binary );
112
113 fout << "# Key:\n"
114 << "# G: group name, descriptive name\n"
115 --- src/tools/Makefile.am.old 2008-08-28 21:08:30.000000000 +0200
116 +++ src/tools/Makefile.am 2008-08-28 21:08:56.000000000 +0200
117 @@ -56,6 +56,8 @@
118 subpageitemtags.cpp\
119 subpageitemtags.h\
120 subpagenames.cpp\
121 - subpagenames.h
122 + subpagenames.h\
123 + ../util.cpp\
124 + ../util.h
125
126
127 --- src/tools/main.cpp.old 2008-08-28 21:34:28.000000000 +0200
128 +++ src/tools/main.cpp 2008-08-28 21:35:03.000000000 +0200
129 @@ -96,28 +96,28 @@
130 bool MyApp::OnInit()
131 {
132 DFBooks *dfBooks = new DFBooks;
133 - dfBooks->Load( GetDataPath("%s/world/books.txt"), "B");
134 + dfBooks->Load( GetDataPath("/world/books.txt"), "B");
135
136 DFMissions *dfMissions = new DFMissions;
137 - dfMissions->Load( GetDataPath("%s/world/missions.txt"), "MT");
138 + dfMissions->Load( GetDataPath("/world/missions.txt"), "MT");
139
140 DFGui *dfGui = new DFGui;
141 - dfGui->Load( GetDataPath("%s/world/gui.txt"), "T");
142 + dfGui->Load( GetDataPath("/world/gui.txt"), "T");
143
144 DFSkills *dfSkills = new DFSkills;
145 - dfSkills->Load( GetDataPath("%s/world/skills.txt"), "S");
146 + dfSkills->Load( GetDataPath("/world/skills.txt"), "S");
147
148 DFSpells *dfSpells = new DFSpells;
149 - dfSpells->Load( GetDataPath("%s/world/spells.txt"), "S");
150 + dfSpells->Load( GetDataPath("/world/spells.txt"), "S");
151
152 DFCreatures *dfCreatures = new DFCreatures;
153 - dfCreatures->Load( GetDataPath("%s/world/creatures.txt"), "M");
154 + dfCreatures->Load( GetDataPath("/world/creatures.txt"), "M");
155
156 DFLocations *dfLocations = new DFLocations;
157 - dfLocations->Load( GetDataPath("%s/world/locations.txt"), "L");
158 + dfLocations->Load( GetDataPath("/world/locations.txt"), "L");
159
160 DFRpg *dfRpg = new DFRpg;
161 - dfRpg->Load( GetDataPath("%s/world/rpg.txt"), "GTF");
162 + dfRpg->Load( GetDataPath("/world/rpg.txt"), "GTF");
163
164
165 g_DFList["Books"] = dfBooks;
Report Message
Find on MARC Find on Google Groups