Corrected orthographe of part of Glob2. #85

stephanemagnenat · 2023-04-29T09:39:49Z

This corrects the orthography of part of Glob2 in order to make it more comfortable to work with, and makes using IDE with integrated spell-checking less visually distracting. It also removes some French-ism ;-)

Note that, to limit merge conflict, this does not change:

file names,
section names in Glob2 text data format,
SGSL function names.

stephanemagnenat · 2023-04-30T08:58:16Z

Adding more classes, including libGAG.

stephanemagnenat · 2023-05-01T18:54:18Z

This looks ready to be merged from my side. I tested a bit and saw no regression, but it would be good if others would test a bit as well!

Quipyowert2 · 2023-05-02T05:33:45Z

I have reviewed libgag/ and everything in src/ in alphabetical order up to but not including Unit.h. Tomorrow after work or maybe on Wednesday I can review some more.

What I've found is that in Minimap.cpp the variable pPolIndex should probably be pColIndex and also a possible logic bug: src/SGSL.cpp:405 should be t=GameGUI::HighlightForbiddenZoneOnPanel, but it highlights free workers instead. Also, S_LOOSE should be S_LOSE.

Also, there was a Unicode problem in RessourcesTypes.h where a private use character was used for an è (e with grave accent) in the spelling of Luc-Olivier's name. After this change, the accented e character shows up as a Unicode character 0xFFFD in both GitHub web review UI and in Visual Studio Code. The raw hexadecimal in the file is "EF BF BD", which seems to be private use characters which are not supported on my laptop. Please consider amending the commit that introduced that change to undo that change; the other change in that file looks fine.

Quipyowert2 · 2023-05-04T05:41:38Z

I have reviewed some more files yesterday before work and tonight. Currently at src/YOGClientMapDownloadScreen.cpp. Only 726 more changes to review :/. I think I'll have some time after work Thursday or Friday or on the weekend to finish reviewing.

stephanemagnenat · 2023-05-04T06:45:44Z

Thank you very much for doing that!

Quipyowert2

Finished reviewing.

My review notes:

TODO: finish reviewing PR #85.
2023-04-30 PR #85 review progress: src/GameGUI.h:135 reviewed for about 10 hours
2023-05-01 PR #85 review progress: src/Unit.h reviewed for 11 hours
2023-05-02 PR #85 review progress: src/Version.h:61 reviewed for about half an hour
2023-05-03 PR #85 review progress: src/YOGClientMapDownloadScreen.cpp reviewed for an hour.
(skipped YOGClient.cpp)
2023-05-04 PR #85 review progress: src/YOGServerRouterPlayer.cpp reviewed for an hour and 15 minutes.
(finished reviewing YOGClient.cpp)

Number of remaining changes to review

git diff stephanemagnenat/master..pull85 --stat | awk '{print $3, $1}' | perl -ne 'chomp;print "$_\n" if m/^\d+ (.*)$/ && $1 gt "src/YOGClientLobbyScreen.h"' | awk '{print $1}' | perl -E 'use List::Util "sum";my @numbers = map {chomp;$_} <>;say sum @numbers'

src/YOGClientPlayerListManager.h "This will return the list of players on hosted on the server." extra "on" here?
src/Utilities.cpp strmlen doesn't seem to be documented.
SGSL.cpp:405 There seems to be a bug here. Forbidden zone should be highlighted but instead t is set to HighlightWorkersWorkingFreeStat instead of HighlightForbiddenZoneOnPanel
SGSL.cpp:634 S_LOOSE should be S_LOSE.
OverlayAreas.cpp:139 Pythagorean theorem?

NetMessage.h:1564,1565 why a double private: modifier here?
NetMessage.cpp cool trick in NetSendGamePlayerInfo::downloadToGameHeader
NetMessage.cpp:3126 (NetSendReteamingInformation::operator==) shouldn't this method use dynamic_cast instead of typeid?

MapGenerator.h:55 voronoi?

Building::isHardSpaceForBuilding what is tltn variable? "type level to next"?
Game::executeOrder why the m in oMcf is capitalized?

PR#85 src/Building.cpp:2530 loop could be replaced with std::accumulate. Also, possible division by zero if type->maxResources array is full of zeroes.

SGSL is the old scripting language in the game; USL is the new one.

algae is limited by near underground? Explorers can attack?

libgag/src/StringTable.cpp

src/AICastor.cpp

src/AIEcho.h

src/YOGServerPlayer.cpp

Quipyowert2 · 2023-05-05T05:08:12Z

src/YOGServerPlayer.h

@@ -90,7 +90,7 @@ class YOGServerPlayer
 		NeedToSendServerInformation,
 		///Means its waiting for a login attempt by the client.


Should probably be "it's waiting".

Quipyowert2 · 2023-05-05T05:10:02Z

src/YOGServerPlayer.cpp

 	else if(type==MNetRequestDownloadableMapList)
 	{
 		shared_ptr<NetRequestDownloadableMapList> info = static_pointer_cast<NetRequestDownloadableMapList>(message);
 		server.getMapDatabank().sendMapListToPlayer(server.getPlayer(playerID));
 	}
-	//This recieves
+	//This receives


"This receives..." what? Oh, a message asking to upload a map.

Quipyowert2 · 2023-05-05T05:11:44Z

src/YOGServerPlayer.cpp

@@ -291,7 +291,7 @@ void YOGServerPlayer::update()
 			sendMessage(info);
 		}
 	}
-	//This recieves a cancel to a file upload
+	//This receives a cancel to a file upload


Something along the lines of "This receives a message saying to cancel a file upload" would be better grammatically.

Quipyowert2 · 2023-05-05T05:16:39Z

src/YOGServerRouterAdministratorCommands.h

@@ -64,7 +64,7 @@ class YOGServerRouterAbortCommand : public YOGServerRouterAdministratorCommand
 };


-///This command causes a router to disconnect from the server and turn off once all clients disconnecty
+///This command causes a router to disconnect from the server and turn off once all clients disconnected


How about "once all clients have disconnected"?

Quipyowert2

Finished reviewing.

Review Notes

TODO: finish reviewing PR #85.
2023-04-30 PR #85 review progress: src/GameGUI.h:135 reviewed for about 10 hours
2023-05-01 PR #85 review progress: src/Unit.h reviewed for 11 hours
2023-05-02 PR #85 review progress: src/Version.h:61 reviewed for about half an hour
2023-05-03 PR #85 review progress: src/YOGClientMapDownloadScreen.cpp reviewed for an hour.
(skipped YOGClient.cpp)
2023-05-04 PR #85 review progress: src/YOGServerRouterPlayer.cpp reviewed for an hour and 15 minutes.
(finished reviewing YOGClient.cpp)

Number of remaining changes to review

git diff stephanemagnenat/master..pull85 --stat | awk '{print $3, $1}' | perl -ne 'chomp;print "$_\n" if m/^\d+ (.*)$/ && $1 gt "src/YOGClientLobbyScreen.h"' | awk '{print $1}' | perl -E 'use List::Util "sum";my @numbers = map {chomp;$_} <>;say sum @numbers'

src/YOGClientPlayerListManager.h "This will return the list of players on hosted on the server." extra "on" here?
src/Utilities.cpp strmlen doesn't seem to be documented.
SGSL.cpp:405 There seems to be a bug here. Forbidden zone should be highlighted but instead t is set to HighlightWorkersWorkingFreeStat instead of HighlightForbiddenZoneOnPanel
SGSL.cpp:634 S_LOOSE should be S_LOSE.
OverlayAreas.cpp:139 Pythagorean theorem?

NetMessage.h:1564,1565 why a double private: modifier here?
NetMessage.cpp cool trick in NetSendGamePlayerInfo::downloadToGameHeader
NetMessage.cpp:3126 (NetSendReteamingInformation::operator==) shouldn't this method use dynamic_cast instead of typeid?

MapGenerator.h:55 voronoi?

Building::isHardSpaceForBuilding what is tltn variable? "type level to next"?
Game::executeOrder why the m in oMcf is capitalized?

PR#85 src/Building.cpp:2530 loop could be replaced with std::accumulate. Also, possible division by zero if type->maxResources array is full of zeroes.

SGSL is the old scripting language in the game; USL is the new one.

algae is limited by near underground? Explorers can attack?

stephanemagnenat force-pushed the fix/orthograph branch 3 times, most recently from 5068f32 to 62fbac2 Compare April 29, 2023 10:19

stephanemagnenat changed the title ~~Corrected ortograph of some core classes.~~ Corrected orthographe of some core classes. Apr 29, 2023

stephanemagnenat changed the title ~~Corrected orthographe of some core classes.~~ Corrected orthographe of part of Glob2. Apr 30, 2023

stephanemagnenat force-pushed the fix/orthograph branch from a91ca1d to 0eb130e Compare May 1, 2023 15:19

Quipyowert2 reviewed May 5, 2023

View reviewed changes

stephanemagnenat force-pushed the fix/orthograph branch from 1888212 to 080be60 Compare October 9, 2024 08:56

stephanemagnenat added 5 commits October 9, 2024 10:59

Corrected ortograph of some core classes.

ba3c0f1

Corrected orthograph of more classes, including full libGAG.

bdb27d7

Corrected orthograph of AI source code.

e3e9bea

Correct orthograph of more classes.

6569c18

Finished correction orthograph in src/ directory.

2adc3e3

stephanemagnenat force-pushed the fix/orthograph branch 4 times, most recently from bbf2189 to c7bb44d Compare October 9, 2024 09:44

stephanemagnenat force-pushed the fix/orthograph branch from 4ffc52d to 2752f89 Compare October 27, 2024 11:04

Applied Quipyowert2's comments.

d9ba9b4

stephanemagnenat force-pushed the fix/orthograph branch from 2752f89 to d9ba9b4 Compare October 27, 2024 11:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Corrected orthographe of part of Glob2. #85

Corrected orthographe of part of Glob2. #85

stephanemagnenat commented Apr 29, 2023 •

edited

Loading

stephanemagnenat commented Apr 30, 2023

stephanemagnenat commented May 1, 2023

Quipyowert2 commented May 2, 2023 •

edited

Loading

Quipyowert2 commented May 4, 2023 •

edited

Loading

stephanemagnenat commented May 4, 2023

Quipyowert2 left a comment

Quipyowert2 May 5, 2023

Quipyowert2 May 5, 2023

Quipyowert2 May 5, 2023

Quipyowert2 May 5, 2023

Quipyowert2 left a comment •

edited

Loading

		@@ -90,7 +90,7 @@ class YOGServerPlayer
		NeedToSendServerInformation,
		///Means its waiting for a login attempt by the client.

Corrected orthographe of part of Glob2. #85

Are you sure you want to change the base?

Corrected orthographe of part of Glob2. #85

Conversation

stephanemagnenat commented Apr 29, 2023 • edited Loading

stephanemagnenat commented Apr 30, 2023

stephanemagnenat commented May 1, 2023

Quipyowert2 commented May 2, 2023 • edited Loading

Quipyowert2 commented May 4, 2023 • edited Loading

stephanemagnenat commented May 4, 2023

Quipyowert2 left a comment

Choose a reason for hiding this comment

Quipyowert2 May 5, 2023

Choose a reason for hiding this comment

Quipyowert2 May 5, 2023

Choose a reason for hiding this comment

Quipyowert2 May 5, 2023

Choose a reason for hiding this comment

Quipyowert2 May 5, 2023

Choose a reason for hiding this comment

Quipyowert2 left a comment • edited Loading

Choose a reason for hiding this comment

stephanemagnenat commented Apr 29, 2023 •

edited

Loading

Quipyowert2 commented May 2, 2023 •

edited

Loading

Quipyowert2 commented May 4, 2023 •

edited

Loading

Quipyowert2 left a comment •

edited

Loading