Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Google signin update #200

Open
wants to merge 792 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
792 commits
Select commit Hold shift + click to select a range
4521396
MP2C,D ...
Lexxie9952 Mar 18, 2022
72b1a81
MP2D ...
Lexxie9952 Mar 18, 2022
3dff9e6
MP2D script.lua also aligns with last commit
Lexxie9952 Mar 18, 2022
2c097cf
MP2D
Lexxie9952 Mar 18, 2022
edd92c0
Update commands.c
Lexxie9952 Mar 18, 2022
b5e3097
Update units.png
Lexxie9952 Mar 19, 2022
4497467
Fishtrap: graphics
Lexxie9952 Mar 19, 2022
a2d52bc
Fishtrap: Client
Lexxie9952 Mar 19, 2022
9283ad7
MP2D; Fishtraps
Lexxie9952 Mar 19, 2022
97819f8
Add Jdenticons to longturn games lists
Lexxie9952 Mar 20, 2022
dd443ca
Remove metamessage string alterations ...
Lexxie9952 Mar 20, 2022
53418b7
Fix cazfi backport commit #653a369440e9a6cc1ae4de59d03e045fdc4228eb
Lexxie9952 Mar 20, 2022
8839a74
FCW: techleak ignores the "idle dead" and untaken player slots
Lexxie9952 Mar 20, 2022
f7ad6e9
MP2C,D ...
Lexxie9952 Mar 20, 2022
0365d68
MP2D ...
Lexxie9952 Mar 20, 2022
684f15c
(1) freeciv/freeciv server BUG-FIX, (2) trade-route info ...
Lexxie9952 Mar 21, 2022
68ca1c4
Client can show others' trade routes under CTRL-ALT-T, with different…
Lexxie9952 Mar 21, 2022
c6089a7
Map grid sprite
Lexxie9952 Mar 21, 2022
f5369e8
Replace mapview_put_grid_line with faster more efficient sprite drawing
Lexxie9952 Mar 21, 2022
372a128
MP2C,D html unit manual
Lexxie9952 Mar 22, 2022
a036691
Update pregame.js
Lexxie9952 Mar 22, 2022
79b8dc3
MP2C ...
Lexxie9952 Mar 22, 2022
be8dd51
Graphic additions
Lexxie9952 Mar 23, 2022
ea547f4
Website: Game Lists all consistent dark theme.
Lexxie9952 Mar 23, 2022
4e4c787
MP2D
Lexxie9952 Mar 23, 2022
6628cec
Bring in is_extra_adjacent(...) function to tile.js
Lexxie9952 Mar 23, 2022
156a2ea
Trawler tile positioning
Lexxie9952 Mar 23, 2022
c48c6b7
Unit orders refactor...
Lexxie9952 Mar 23, 2022
7b66e2c
Update index.jsp
Lexxie9952 Mar 23, 2022
8cd0e70
MP2D
Lexxie9952 Mar 23, 2022
359eefc
Game Info does not (falsely) offer option to observe longturn games.
Lexxie9952 Mar 23, 2022
355b5b0
Make broadcast_city_info() fix identical to upstream master
Lexxie9952 Mar 23, 2022
6bee3f6
Update citytools.c
Lexxie9952 Mar 24, 2022
144ce34
Unassigned players don't start with 100% sci ...
Lexxie9952 Mar 24, 2022
6187582
Bring in "Fix division by zero when "Fix division by zero when transf…
Lexxie9952 Mar 25, 2022
8ec3688
Scale punit->fuel with rigorous rectitude during utype transformation.
Lexxie9952 Mar 25, 2022
9d5feaf
Create trawler.png
Lexxie9952 Mar 25, 2022
201334c
Update units_oversize.png
Lexxie9952 Mar 25, 2022
3e190f1
MP2D unit refactoring...
Lexxie9952 Mar 25, 2022
6ff7d48
MP2D: refactor actionenablers for cargorestrained sea classes.
Lexxie9952 Mar 25, 2022
342db3c
MP2D Trawler move speed effects
Lexxie9952 Mar 25, 2022
64357c1
MP2D
Lexxie9952 Mar 25, 2022
2e555a4
Client: In city dialog, display pollution probability as a % rather t…
Lexxie9952 Mar 25, 2022
97427f6
Change unit_could_possibly_load() heuristics when Trawler is ttype
Lexxie9952 Mar 25, 2022
cebe323
Server: bring in hacky placeholder for eventual is_cargo_visible() me…
Lexxie9952 Mar 25, 2022
4fcac92
Bounced fuel and hp_loss units don't auto-disband but instead pick a …
Lexxie9952 Mar 25, 2022
2d854f0
attach_longturn_player does a full player_set_under_human_control…
Lexxie9952 Mar 25, 2022
5827dd5
MP2D
Lexxie9952 Mar 25, 2022
ff1085a
Update changelog.txt
Lexxie9952 Mar 25, 2022
5d679de
HACK FIX plrhand.c get_player_maxrate()
Lexxie9952 Mar 25, 2022
40a95ab
Update unittools.c
Lexxie9952 Mar 25, 2022
774031b
MP2C
Lexxie9952 Mar 27, 2022
91f5713
MP2D
Lexxie9952 Mar 27, 2022
62f12a4
Attempted fix of segfault in can_player_see_unit_at()
Lexxie9952 Mar 27, 2022
7c4c5f7
Update controls.txt
Lexxie9952 Mar 27, 2022
8c7f48a
Remove "." right after emojis
Lexxie9952 Mar 27, 2022
a151292
Unittypes with UTYF_RESERVED1 can attack units without "Provoking" ...
Lexxie9952 Mar 27, 2022
b856d3a
MP2D ...
Lexxie9952 Mar 27, 2022
d75632e
MP2D ...
Lexxie9952 Mar 27, 2022
e7f01cd
MP2D ...
Lexxie9952 Mar 27, 2022
252e5ef
MP2D
Lexxie9952 Mar 27, 2022
a98640c
Update fc_types.h
Lexxie9952 Mar 27, 2022
9bc1520
Update unittype.h
Lexxie9952 Mar 27, 2022
d7288b7
A unit under vigil reports that it's vigiling if mid-clicked
Lexxie9952 Mar 27, 2022
03df4bd
Update unit.js
Lexxie9952 Mar 27, 2022
b503518
Client: unit_can_vigil() supports new MP2D vigil units
Lexxie9952 Mar 27, 2022
a0eb8b4
MP2A,B,C
Lexxie9952 Mar 28, 2022
752463a
Wonder graphics
Lexxie9952 Mar 29, 2022
8a87137
MP2C helptext
Lexxie9952 Mar 29, 2022
1a6c21a
Reveal successful defenders' hp after battle ...
Lexxie9952 Mar 29, 2022
ed4856e
units_oversize.png and .spec
Lexxie9952 Mar 29, 2022
e374906
Client support for rulesets...
Lexxie9952 Mar 29, 2022
c2090b8
clientutils.c ...
Lexxie9952 Mar 29, 2022
ab9aeb7
MP2D big one.
Lexxie9952 Mar 29, 2022
934c0d3
MP2D manual
Lexxie9952 Mar 29, 2022
c3b804a
MP2D
Lexxie9952 Mar 29, 2022
ef39f04
Update logistics_foot_load.png
Lexxie9952 Mar 29, 2022
ed8424d
MP2D
Lexxie9952 Mar 30, 2022
06bcc6c
MP2D
Lexxie9952 Mar 30, 2022
31d70b9
MP2D
Lexxie9952 Mar 30, 2022
e9d4faa
Update all load/unload logistics charts for manual
Lexxie9952 Mar 30, 2022
e7f5fcd
unit graphics
Lexxie9952 Mar 31, 2022
ddb4372
MP2D unit helptext cut verbosity & corrections
Lexxie9952 Mar 31, 2022
0e7d722
MP2C unit helptext cut verbosity
Lexxie9952 Mar 31, 2022
2c363bb
MP2D minor
Lexxie9952 Mar 31, 2022
4636518
#worklist_dialog_headline static size 60px to avoid layout resizing f…
Lexxie9952 Mar 31, 2022
30d7fc7
MP2C,D html manual
Lexxie9952 Mar 31, 2022
52187c7
Create leibniz_university.png
Lexxie9952 Mar 31, 2022
17bc5ab
Revert "Make broadcast_city_info() fix identical to upstream master"
Lexxie9952 Mar 31, 2022
8321373
Update advanced_backports.txt
Lexxie9952 Mar 31, 2022
3c767f1
Fix: hitting W to leave tax rates doesn't unfreeze ...
Lexxie9952 Mar 31, 2022
f8e21c4
Fix glitch in double-click add to worklist followed by single-click t…
Lexxie9952 Mar 31, 2022
ee55c14
Jdenticon script locally hosted.
Lexxie9952 Apr 1, 2022
1d65df4
minor
Lexxie9952 Apr 1, 2022
98ef297
Change late-join advert message in list.jsp
Lexxie9952 Apr 1, 2022
dc81a53
Hack-patch: in rulesets with Theocracy, Ecc.Palace allows instant tra…
Lexxie9952 Apr 1, 2022
30ac917
MP2C,D document no rules introduced by previous commit.
Lexxie9952 Apr 1, 2022
9457e13
minor
Lexxie9952 Apr 1, 2022
038f037
MP2C
Lexxie9952 Apr 3, 2022
446664a
MP2D
Lexxie9952 Apr 3, 2022
4f7a14c
Late join bulbs are 4 per turn instead of 3.
Lexxie9952 Apr 3, 2022
d50ff4b
Remove jitter-jank from tech tab that happens when helptext appeared …
Lexxie9952 Apr 3, 2022
d28ff7f
minor
Lexxie9952 Apr 3, 2022
1c33941
client, adjustments to unit_can_deboard, unit_could_possibly_load
Lexxie9952 Apr 4, 2022
7e52207
fix error in artillery unload logistics chart
Lexxie9952 Apr 4, 2022
1fcd2d6
New orders buttons Fort,Bunker,Castle,Deep Dive (+hot key)
Lexxie9952 Apr 5, 2022
4783404
Unit graphics
Lexxie9952 Apr 5, 2022
f084e4e
Orders.jsp for new buttons + Graphics for those.
Lexxie9952 Apr 5, 2022
d6addb6
Terrain.c doesn't reveal submarines who dive to deep depth
Lexxie9952 Apr 5, 2022
2f51743
city.hbs: re-allign change prod/add worklist buttons
Lexxie9952 Apr 5, 2022
eaee48b
Create deepdive.png
Lexxie9952 Apr 5, 2022
61eda61
action_dialog.js uses the new buttons and fixes logic to use extra.ru…
Lexxie9952 Apr 5, 2022
bb56cbe
tilespec works with new unit missile destroyer and ability to deep dive
Lexxie9952 Apr 5, 2022
edc6e89
Make Combat_Rounds test the defended tile rather than attacker tile…
Lexxie9952 Apr 6, 2022
b1b2525
Bring in "deep" dive activity graphic
Lexxie9952 Apr 6, 2022
47c41c7
REVERT CANDIDATE: tile claiming base mechanics:
Lexxie9952 Apr 6, 2022
080ba50
REVERT CANDIDATE: 1. refactor creation of extra index constants, ...
Lexxie9952 Apr 6, 2022
0af26de
Make client adjusted for new role of UTYF_USER_FLAG_24
Lexxie9952 Apr 6, 2022
758fe33
MP2D buildings...
Lexxie9952 Apr 6, 2022
31b252a
MP2D effects ...
Lexxie9952 Apr 6, 2022
00c00af
MP2D units
Lexxie9952 Apr 6, 2022
ca9852f
MP2D terrain
Lexxie9952 Apr 6, 2022
db591b8
MP2D techs...
Lexxie9952 Apr 6, 2022
022f397
MP2D actionenablers
Lexxie9952 Apr 6, 2022
1c9e6b0
MP2D changelog
Lexxie9952 Apr 6, 2022
9dded14
unit_could_possibly_load() respects exceptions for 0 move_frag Transp…
Lexxie9952 Apr 6, 2022
921b824
remove debug message
Lexxie9952 Apr 6, 2022
b9a11e6
Client knows rule for can't tow a ship who has moved this turn.
Lexxie9952 Apr 6, 2022
6e3ef3f
MP2D helptext
Lexxie9952 Apr 6, 2022
b6d2e4a
MP2D changelog
Lexxie9952 Apr 6, 2022
0ae2920
MP2D
Lexxie9952 Apr 6, 2022
0ed995b
Fix Transport Board actionenablers for all different class cases.
Lexxie9952 Apr 6, 2022
eae6147
Update README.effects
Lexxie9952 Apr 6, 2022
d265ea1
Update unittools.c
Lexxie9952 Apr 6, 2022
76b1838
(1) Fix shore 33% attack_bonus tile resolution ...
Lexxie9952 Apr 6, 2022
25e1c72
Client smarter adjusting of city canvas size to city_radius_sq...
Lexxie9952 Apr 7, 2022
14f52fd
MP2D bigger cities
Lexxie9952 Apr 7, 2022
4081e88
changelog
Lexxie9952 Apr 7, 2022
058230f
Prevent false auto-attack engagements on unreachable units.
Lexxie9952 Apr 7, 2022
7c31c9a
MP2D: Re-arrange unit indices...
Lexxie9952 Apr 7, 2022
6b867cd
MP2D
Lexxie9952 Apr 7, 2022
8ba20d5
Update packhand.js
Lexxie9952 Apr 7, 2022
866b59b
Logistics unload charts
Lexxie9952 Apr 7, 2022
48c9fe6
Fix: auto-refuel, as a non-human order, and does not incur UWT.
Lexxie9952 Apr 7, 2022
97ec33d
Client update_active_units_dialog(), show fuel_left in all cases.
Lexxie9952 Apr 7, 2022
256d4af
MP2D gov manual
Lexxie9952 Apr 8, 2022
a0dff3d
Create mechanization.png
Lexxie9952 Apr 8, 2022
4a42d6c
TECH user flags in fc_types.js
Lexxie9952 Apr 8, 2022
ce08b1d
MP2D units
Lexxie9952 Apr 8, 2022
ea752d5
Update pregame.js
Lexxie9952 Apr 8, 2022
d3f620a
Install dragscroll .js lib
Lexxie9952 Apr 8, 2022
8ae8cb9
MP2D Big Tech Tree change
Lexxie9952 Apr 8, 2022
7697ed9
Client tech.js BIG EVOLUTION
Lexxie9952 Apr 8, 2022
d4e05cd
Client: update MP2C MP2D reqtrees
Lexxie9952 Apr 8, 2022
b794b9a
MP2D minor
Lexxie9952 Apr 8, 2022
41b8576
MP2D
Lexxie9952 Apr 8, 2022
4d4d6bd
MP2D
Lexxie9952 Apr 8, 2022
ae99049
MP2D prepare units.ruleset for new max_attacks property
Lexxie9952 Apr 9, 2022
6a98247
ATTACKS PER TURN!! - Bring in ruleset definable max_attacks to limit …
Lexxie9952 Apr 9, 2022
57a35c4
MP2D units
Lexxie9952 Apr 9, 2022
70e8056
Unit graphics
Lexxie9952 Apr 9, 2022
853f4e9
Change suicide attack icon, client.
Lexxie9952 Apr 9, 2022
e900029
Helpdata shows max attacks per turn on units
Lexxie9952 Apr 9, 2022
81ca76b
Non-integer combat scores for units applied to dive bomber...
Lexxie9952 Apr 9, 2022
4702531
Update tech.js
Lexxie9952 Apr 9, 2022
51c78c6
MP2D TECHS
Lexxie9952 Apr 9, 2022
3b3e09b
MP2D UNITS
Lexxie9952 Apr 9, 2022
4d465af
MP2D actionenabler for new unit
Lexxie9952 Apr 9, 2022
f44f5d7
MP2D base nativity for new unit
Lexxie9952 Apr 9, 2022
6d67a60
Fix iPillage event interception sound triggers
Lexxie9952 Apr 9, 2022
d0ef5ea
MP2D reqtree
Lexxie9952 Apr 9, 2022
0012738
MP2C,D
Lexxie9952 Apr 9, 2022
c0b7da6
MP2C,D
Lexxie9952 Apr 9, 2022
bb03365
Update changelog2.txt
Lexxie9952 Apr 9, 2022
e4ab180
MP2D
Lexxie9952 Apr 9, 2022
fbaa5e3
Smaller font for sentry wakeup messages
Lexxie9952 Apr 13, 2022
2176505
New Extras Flag EF_REPORTS - behaves like a sentry unit for reporting
Lexxie9952 Apr 13, 2022
fa1a985
Update units.spec
Lexxie9952 Apr 13, 2022
013a63f
MP2D
Lexxie9952 Apr 13, 2022
2f8108e
Clean up 'hard-coded actionenabler heuristics' on client side
Lexxie9952 Apr 13, 2022
fe7a351
Client: Upgrade missile boarding conditions for MP2D stricter rules
Lexxie9952 Apr 14, 2022
c6c6965
MP2D
Lexxie9952 Apr 14, 2022
8a2d895
MP2D
Lexxie9952 Apr 14, 2022
8128f1b
Console Filters, alpha rev.
Lexxie9952 Apr 14, 2022
d013e2c
Add yellow checkbox to the other color options
Lexxie9952 Apr 14, 2022
79031a4
intercept shift-enter and alt-f when inside game_text_input
Lexxie9952 Apr 14, 2022
cd1c2f6
MP2D lua script event categorizations
Lexxie9952 Apr 14, 2022
95fc1c0
Refine console filtering events
Lexxie9952 Apr 14, 2022
e2b3e77
more events to last commit
Lexxie9952 Apr 14, 2022
92552a1
Update console_filters.js
Lexxie9952 Apr 14, 2022
a484a93
Bring in console filters icon button
Lexxie9952 Apr 14, 2022
5eaa99c
Console Filter zIndex, mobile size, and position adjust.
Lexxie9952 Apr 15, 2022
b5fd7a9
MP2D
Lexxie9952 Apr 15, 2022
5da2136
New Effect: EFT_RAZE_BUILDING_PCT
Lexxie9952 Apr 15, 2022
9326c0d
MP2D
Lexxie9952 Apr 15, 2022
8baba1b
Longturn games don't auto-end...
Lexxie9952 Apr 15, 2022
8f68988
Add 3D WebGl client back again.
andreasrosdal Apr 16, 2022
ca472cc
Reduce round-up rate in get_activity_rate()
Lexxie9952 Apr 16, 2022
f3a78b8
Hover helptext on units (city panel, empire tab, etc.) shows worker-t…
Lexxie9952 Apr 16, 2022
b7b27bc
Total city unit upkeeps in supported units panel
Lexxie9952 Apr 17, 2022
2f54673
Empire tabs sort cities in same order as Cities list
Lexxie9952 Apr 17, 2022
ce658b6
Merge branch 'webgl-client' into 'master'
Lexxie9952 Apr 17, 2022
3a56ead
FIX shield visibility bug caused by 3D re-commit, (2)...
Lexxie9952 Apr 17, 2022
1b7032d
SAM Battery graphics
Lexxie9952 Apr 17, 2022
4f3a50e
console filters keep chatbox glued to bottom
Lexxie9952 Apr 17, 2022
278797d
MP2C unit helptext
Lexxie9952 Apr 17, 2022
25323ba
MP2D unit helptext
Lexxie9952 Apr 17, 2022
51ca803
Update load/unload/board/deboard planning agenda
Lexxie9952 Apr 17, 2022
f8d9264
MP2C bring in SAM Battery graphic support
Lexxie9952 Apr 17, 2022
8f4cce5
MP2D Sam Battery visibility report
Lexxie9952 Apr 17, 2022
953704f
Update swamp.spec
CanikTnT Apr 19, 2022
20ed888
Update README.md
CanikTnT Apr 21, 2022
5faedad
Create mp2c-desert/README.txt
CanikTnT Apr 21, 2022
7dae635
mp2c-desert files
CanikTnT Apr 21, 2022
9b03528
TnT WEB-INF index.jsp
CanikTnT Apr 21, 2022
fab2f1b
Update 404.jsp
CanikTnT Apr 21, 2022
b46be4f
Update head.jsp
CanikTnT Apr 21, 2022
6feb673
Update header.jsp
CanikTnT Apr 21, 2022
584f462
amplio2 TnT
CanikTnT Apr 22, 2022
130dc63
Create mp2c-occ folder/README.txt
CanikTnT Apr 22, 2022
37d66cf
mp2c-occ files
CanikTnT Apr 22, 2022
753da8b
mp2c occ/desert .serv files
CanikTnT Apr 22, 2022
e61555d
add mp2 rulesets to makefile
CanikTnT Apr 22, 2022
1896102
Update Makefile.am
CanikTnT Apr 22, 2022
ad1d89b
Update configure.ac
CanikTnT Apr 22, 2022
dce9b09
create mp2-ag makefile
CanikTnT Apr 22, 2022
a27a9e0
create mp2-brava Makefile
CanikTnT Apr 22, 2022
4f79a7e
create mp2-caravel Makefile.am
CanikTnT Apr 22, 2022
0a3782e
uncomment serverside non-ascii check
CanikTnT Apr 25, 2022
f09077c
update db/migration (google ip + encrypt mode)
CanikTnT Apr 25, 2022
d2fbc16
Update DbManger.java
CanikTnT Apr 25, 2022
565dc68
Update LoginUser.java
CanikTnT Apr 25, 2022
8537ea0
Update freeciv-proxy.py
CanikTnT Apr 25, 2022
b9d2e5b
Remove Lexxie's pseudo-legalese statement from README
daavko Jun 19, 2022
8b66a0f
Merge pull request #2 from daavko/task/readme_cleanup
CanikTnT Jun 20, 2022
a66ad2a
Remove proprietary fonts (#1)
daavko Aug 9, 2022
9739593
add TnT banner/brand
CanikTnT Aug 10, 2022
0aae69a
site backgrounds
CanikTnT Aug 10, 2022
69b51a8
add minimap to mobile
CanikTnT Aug 10, 2022
ce7c79a
comment-out fullscreen popup
CanikTnT Aug 10, 2022
09961bf
Google signin code
Mar 20, 2023
475333e
Change order of loading
Mar 20, 2023
4e1f9ab
Initialize google sign-in library with jQeury
Mar 20, 2023
92fd630
Get div for google button using getElementById
Mar 21, 2023
811cb2b
Initialize google sign-in library with jQeury
Mar 21, 2023
eadad2f
Advanced initialization
Mar 21, 2023
9104866
diplay low friction prompt, Get the client key in a more secure manner
Mar 23, 2023
be7120f
Get the client key in a more secure manner
Mar 23, 2023
f82ac88
Get the client key in a more secure manner
Mar 23, 2023
7c70f9b
Final solution, cleaned up
Mar 25, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replace mapview_put_grid_line with faster more efficient sprite drawing
  • Loading branch information
Lexxie9952 committed Mar 21, 2022
commit f5369e8b5dfbc9d9138024588bf464fdf3377d54
4 changes: 3 additions & 1 deletion freeciv-web/src/main/webapp/javascript/2dcanvas/mapview.js
Original file line number Diff line number Diff line change
@@ -623,7 +623,8 @@ function mapview_put_tile_label(pcanvas, tile, canvas_x, canvas_y) {

/**************************************************************************
Renders the national border lines onto the canvas.
**************************************************************************/
DEPRECATED BECAUSE CPU LOAD WAS TOO HEAVY
***************************************************************************
function mapview_put_grid_line(pcanvas, dir, color, canvas_x, canvas_y) {
var x = canvas_x + 47;
var y = canvas_y + 3;
@@ -650,6 +651,7 @@ function mapview_put_grid_line(pcanvas, dir, color, canvas_x, canvas_y) {
pcanvas.closePath();
pcanvas.stroke();
}
*/

/**************************************************************************
Renders the national border lines onto the canvas.
Original file line number Diff line number Diff line change
@@ -566,8 +566,6 @@ function put_drawn_sprites(pcanvas, canvas_x, canvas_y, pdrawn, fog)
mapview_put_city_bar(pcanvas, pdrawn[i]['city'], canvas_x + offset_x, canvas_y + offset_y);
} else if (pdrawn[i]['key'] == "border" ) {
mapview_put_border_line(pcanvas, pdrawn[i]['dir'], pdrawn[i]['color'], pdrawn[i]['color2'], pdrawn[i]['color3'], canvas_x, canvas_y);
} else if (pdrawn[i]['key'] == "mapgrid" ) {
mapview_put_grid_line(pcanvas, pdrawn[i]['dir'], pdrawn[i]['color'], canvas_x, canvas_y);
} /* else if (pdrawn[i]['key'] == "territory" ) {
mapview_territory_fill(pcanvas, pdrawn[i]['color'], canvas_x, canvas_y);
} */ else if (pdrawn[i]['key'] == "goto_line" ) {
30 changes: 2 additions & 28 deletions freeciv-web/src/main/webapp/javascript/2dcanvas/tilespec.js
Original file line number Diff line number Diff line change
@@ -284,7 +284,7 @@ function fill_sprite_array(layer, ptile, pedge, pcorner, punit, pcity, citymode)
var pterrain = tile_terrain(ptile);

sprite_array = sprite_array.concat(fill_terrain_sprite_layer(2, ptile, pterrain, tterrain_near));

if (draw_map_grid) sprite_array = sprite_array.concat({"key":"grid.map"});
sprite_array = sprite_array.concat(fill_irrigation_sprite_array(ptile, pcity));
}
break;
@@ -300,8 +300,7 @@ function fill_sprite_array(layer, ptile, pedge, pcorner, punit, pcity, citymode)
if (ptile != null) {
// TEST: borders moved from last sub-layer of LAYER_SPECIAL1 to here:
// it was drawing on top of resources, and seemed better here:
if (draw_map_grid) sprite_array = sprite_array.concat(get_grid_line_sprites(ptile));
sprite_array = sprite_array.concat(get_border_line_sprites(ptile));
sprite_array = sprite_array.concat(get_border_line_sprites(ptile));

var spec_sprite = get_tile_specials_sprite(ptile);
if (spec_sprite != null) sprite_array.push(spec_sprite);
@@ -1153,31 +1152,6 @@ function get_border_line_sprites(ptile)
return result;
}

/**********************************************************************
...ADD_SPRITE_SIMPLE(t->sprites.grid.main[pedge->type] used in gtk client
***********************************************************************/
function get_grid_line_sprites(ptile)
{
var result = [];

// first test run, just draw the player's border on every tile

for (var i = 0; i < num_cardinal_tileset_dirs/2; i++) {
var dir = cardinal_tileset_dirs[i];
var checktile = mapstep(ptile, dir);

if (checktile != null) {
if (terrains[ptile['terrain']]['name'] == "Deep Ocean")
result.push({"key" : "mapgrid", "dir" : dir, "color": "rgba(66,57,47,1.0)" }); //stronger contrast on deep ocean
else
result.push({"key" : "mapgrid", "dir" : dir, "color": "rgba(0,0,0,0.35)" });
}
}

return result;
}


/**********************************************************************
...returns the shield (not the flag)
***********************************************************************/