Commit Graph

15373 Commits

Author SHA1 Message Date
elexis 0d41806e99 Session cleanup.
Move formating of resource-amounts to new function
translateResourceAmounts.
Rename player/player1 to sourcePlayer/targetPlayer.
Inline colorizedPlayername.

This was SVN commit r17556.
2015-12-26 01:40:50 +00:00
elexis 5d56ee0449 Session cleanup.
Move new objects to globals, which makes the code easier to read,
changable for mods and saves performance.
Move cheat functions below variable declarations.

Remove old function formatClientList, which for any reason didn't make
it into last commit.

This was SVN commit r17555.
2015-12-26 00:42:52 +00:00
elexis a280cb87db Colorize playernames when using the /list command in the gamesetup/session.
Add two missing semicolons and remove an unnecessary one.
Eliminate formatClientList, message, formattedUsername and
formattedUsernamePrefix.
Move four hardcoded colors to globals.

This was SVN commit r17554.
2015-12-25 23:49:28 +00:00
elexis 5f95bca6b0 Session cleanup (trading dialog text).
Move the code to update the idle-traders text to two new simplified
functions.
Eliminate all if-statements (including quadruple-nested ones).

This was SVN commit r17553.
2015-12-25 19:35:14 +00:00
elexis 0fb87496e7 Display the correct AI name instead of "Unknown Player" in case an AI sends a formatted chat message (introduced in 03adf0111a).
Thanks Evulant (AlThePhoenix) for reporting.

This was SVN commit r17552.
2015-12-25 18:07:16 +00:00
elexis b154056266 Those globals were removed in 5aae5ee55a.
This was SVN commit r17550.
2015-12-24 20:54:47 +00:00
elexis 5aae5ee55a Session menu cleanup.
Replace for-each with for-of.
Remove duplicate code from updateMenuPosition.
Eliminate three unneeded globals.
Rename savedGameData to g_SavedGameData.
Remove unneeded braces.

This was SVN commit r17549.
2015-12-24 14:59:03 +00:00
elexis 39ffb0a6bd Session menu cleanup.
Rename globals to g_Foo.
Remove unused variable playerID from updateTimeNotifications which
became obsolete in fe9eeedd66.
Use let instead of var.
Add some missing semicolons.
Fix whitespace, quote object keys.

This was SVN commit r17548.
2015-12-24 02:53:18 +00:00
elexis 7a75f22f9f Session cleanup.
Transform switch-statement in handleNetMessage to object of fat-arrow
functions.

Also add missing check to colorizePlayernameByGUID.

This was SVN commit r17547.
2015-12-24 01:46:06 +00:00
elexis 7caaa278d6 Session cleanup.
Move code from switch-statement to handlePlayerAssignmentsMessage.
Inline updatePlayerDataAdd and updatePlayerDataRemove as they are tiny
and only used here.
Remove comments, early return, eliminate for-each.

This was SVN commit r17546.
2015-12-24 01:06:01 +00:00
elexis f276791069 Session cleanup.
Transform netstatus switch-statement to an object consisting of a
fat-arrow function per message type.

This was SVN commit r17545.
2015-12-23 23:51:18 +00:00
elexis 3dcf51c466 Session chat cleanup.
Remove duplicate code by transforming getUsernameAndColor to
colorizePlayername.
Notice the previous function getUsernameAndColorByGUID didn't work with
unassigned players.

This was SVN commit r17544.
2015-12-23 19:06:48 +00:00
mimo 48f72aacc9 petra: some defense tweaks + cleanup
This was SVN commit r17543.
2015-12-23 16:17:05 +00:00
elexis 4eedfac0ca Refactor session chat.
Show chatmessages for diplomacy-changes and tributed resources to
observers/in replays. Fixes #3379.

This was SVN commit r17542.
2015-12-23 15:48:06 +00:00
elexis 03adf0111a Session chat cleanup
Remove g_PlayerAssignments from calls to findGuidForPlayerID, since the
argument was removed in ae92736b02.
Simplify formatChatMessage by moving playercolor-detection to
formatDefeatMessage and formatChatCommand.

This was SVN commit r17541.
2015-12-22 21:45:09 +00:00
leper cf7b8329fb Use var instead of let, since this variable is defined with var in this function already.
This was SVN commit r17540.
2015-12-22 20:43:17 +00:00
leper 3fd4d07ca1 Test \0 in object property names for serializing.
This was SVN commit r17539.
2015-12-22 19:01:18 +00:00
mimo 67b7366528 petra: remove hyphen in file names
This was SVN commit r17538.
2015-12-22 18:21:37 +00:00
elexis ae92736b02 Session chat cleanup.
Use .property instead of ["property"].
Use if (object.property) instead of if ("property" in object).
Use array- and fat-arrow functions.

This was SVN commit r17537.
2015-12-22 17:37:22 +00:00
mimo 3ba50b4ed4 decrease the repair rate of walls, refs #3707
This was SVN commit r17536.
2015-12-22 17:37:00 +00:00
leper 6970ebba16 Test non-ASCII string conversions.
This was SVN commit r17535.
2015-12-22 17:30:05 +00:00
elexis ef7c01ee4c Don't error out when selecting maps with non-existent civs.
This was SVN commit r17534.
2015-12-22 17:04:57 +00:00
mimo 385101bbe7 petra: cleanup of defenseManager
This was SVN commit r17533.
2015-12-22 16:58:53 +00:00
elexis dca07f9ddd Fix e9bc3e2089.
This was SVN commit r17532.
2015-12-22 16:44:27 +00:00
elexis 4212777334 Session chat cleanup.
Correct indentation.

This was SVN commit r17531.
2015-12-22 16:05:27 +00:00
elexis e9bc3e2089 Session chat cleanup.
Split formatChatMessage into smaller functions.
Correct the indentation with the next commit.

This was SVN commit r17530.
2015-12-22 16:02:25 +00:00
elexis 0e40273c28 Session chat cleanup.
Move code from addChatMessage to a new function formatChatMessage.

This was SVN commit r17529.
2015-12-22 15:29:03 +00:00
elexis 57af0ac8b4 Session chat cleanup.
Remove duplicate call to parseChatCommands.
Rename msg.action to msg.me, as it only applies to the "/me" chat
command.
Remove some duplicate checks.
Remove unused variable userTag.
Also fix a wrong space in the loading screen.

This was SVN commit r17528.
2015-12-22 14:56:30 +00:00
leper 848efb56b3 Make a method const.
This was SVN commit r17527.
2015-12-22 14:08:32 +00:00
elexis bd35b097e2 Session chat cleanup.
Process the "system" case first.
Move shared variable to colorizedPlayername.
Remove trailing whitespace.

This was SVN commit r17526.
2015-12-22 13:38:38 +00:00
elexis b790403c87 Strip trailing whitespace from network code.
This was SVN commit r17524.
2015-12-21 13:58:32 +00:00
elexis 72dcd7422d Loading screen cleanup. Patch by Stan, refs #2087.
Use let instead of var.
Use g_ prefix for globals.
Remove trailing whitespace.

This was SVN commit r17523.
2015-12-20 23:02:18 +00:00
elexis 41fa85a34b Map cleanup.
Remove the "Seed" attribute as it is a relict of Atlas and not used
anywhere.
Also remove the author-tag of Forest Battle (4) as it's the only map
that has it.

This was SVN commit r17522.
2015-12-20 21:48:48 +00:00
mimo 0dda3b579c drop resources before switching to next queued order, fixes #1670
This was SVN commit r17521.
2015-12-20 21:30:34 +00:00
elexis d4d05c6236 Session cleanup. Patch by Stan.
Eliminate the deprecated for-each.

This was SVN commit r17520.
2015-12-20 21:20:05 +00:00
mimo 423d26890a fix cases where changes in unitai orders were not transmitted to the ai
This was SVN commit r17519.
2015-12-20 21:07:47 +00:00
elexis bacedf18bc Show the repair-ratio in the tooltip of buildings. Patch by bb, refs #3395.
This was SVN commit r17518.
2015-12-20 20:40:42 +00:00
elexis eb8e381934 GuiInterface Cleanup
Remove trailing whitespace.

This was SVN commit r17517.
2015-12-20 19:18:39 +00:00
elexis fab9327a14 GuiInterface cleanup. Refs #3395.
Simplify GetAverageRangeForBuildings and GetFormationInfoFromTemplate.
Use let instead of var.
Quote object keys.
Remove unneeded braces and variables.
Remove unused variable cmpMirage in L414 and numCleared in L1096.
Add missing semicolon in L637.
Use fat-arrow function.

This was SVN commit r17516.
2015-12-20 19:05:57 +00:00
elexis c2b74197e0 Cleanup tooltips and selection details. Refs #3395.
Use let instead of var.
Quote object keys.
Prefix globals with g_.
Remove some unneeded variables.
Use ternary operator and fat arrow functions.

This was SVN commit r17515.
2015-12-20 17:15:21 +00:00
scythetwirler eea104748d Adjusts female citizen HP cost correctly using relative templates. Fixes #3510. Patch by Palaxin.
This was SVN commit r17514.
2015-12-19 22:57:28 +00:00
leper 509028d738 CompileOptions::setFileAndLine does not copy the string, so create a copy for it.
This was SVN commit r17512.
2015-12-19 02:55:30 +00:00
leper 332096e4ed SpiderMonkey 38 removes JS_AllocateArrayBufferContents.
Users required the returned buffer to be passable to free(), so replace
it by malloc().
https://bugzilla.mozilla.org/show_bug.cgi?id=1037358

This was SVN commit r17511.
2015-12-19 02:49:46 +00:00
leper 190f9176df SpiderMonkey 38 removes JS_NewPropertyIterator, use JS_Enumerate instead.
https://bugzilla.mozilla.org/show_bug.cgi?id=1081660

This was SVN commit r17510.
2015-12-19 02:21:22 +00:00
elexis e80e37cb21 Fix whitespace.
This was SVN commit r17509.
2015-12-19 02:03:30 +00:00
leper 753936e7df SpiderMonkey 38 removes JS_Evaluate{,UC}Script, use JS::Evaluate.
https://bugzilla.mozilla.org/show_bug.cgi?id=1100579

This was SVN commit r17508.
2015-12-19 01:58:03 +00:00
elexis 56bf37a54e Simulation cleanup (Attack.js)
Use let instead of var.
Do not redeclare timeToTarget and cmpTimer.
Remove unused variable graphicalPosition.
Fix some whitespace issues.

This was SVN commit r17507.
2015-12-19 01:48:11 +00:00
leper 2239fe338c The jschar typedef is removed in SpiderMonkey 38.
Since it already is char16_t in 31 replace it by that.
https://bugzilla.mozilla.org/show_bug.cgi?id=1063962

This was SVN commit r17506.
2015-12-19 01:29:55 +00:00
leper 69ab2bae5b Some ctors were made explicit in SpiderMonkey 38, so call them where needed.
https://bugzilla.mozilla.org/show_bug.cgi?id=1013663

This was SVN commit r17505.
2015-12-19 01:13:56 +00:00
leper efda359acc Use new when calling the builtin typed array constructor.
The current code will be forbidden in ES6.

This was SVN commit r17504.
2015-12-19 01:10:13 +00:00