upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-04 19:40:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,969 Commits 60 Branches 374 Tags
Commit Graph

67 Commits

Author SHA1 Message Date
fendrin
875a9a0126 Added a enabled/disabled states to the map_labels class. 2013-04-08 13:51:30 +02:00
Eric S. Raymond
043c4f9fd3 Remove $Id$ cookies. 2013-03-26 21:41:37 -04:00
Mark de Wever
43b71f2ff0 New year copyright update. 2013-01-01 09:22:03 +00:00
Fabian Müller
e9c16cf709 Implemented a dialog for editing the map labels in the editor. 
Changes to the side menu generation:
Shows the correct side numbers and names,
sadly the default for a side name is "1".
 2012-07-22 16:29:09 +00:00
Fabian Müller
72fc103fe9 Lifted unit drawing from game_display to display. 2012-03-31 18:16:27 +00:00
Mark de Wever
bf91717016 Let operator= return a reference. 
Also add a test for self assignment. Issue discovered by cppcheck.
 2012-03-10 13:29:33 +00:00
Fabian Müller
a03b129fb6 Implemented a copy constructor and assigment operator. 
This is needed since the labels need to be copied in their new role as
memeber of the editor_map class.
 2012-02-28 10:06:39 +00:00
Ignacio R. Morelle
6ca69b2df5 New year copyright update 2012-01-07 02:35:17 +00:00
Mark de Wever
ecbabea838 New year copyright update. 2011-01-01 15:57:50 +00:00
Guillaume Melquiond
64f7f1ee5a Removed the character limit on map labels... 
...and replaced by an area limit. (Fix for bug #15824, bug #16099, and
bug #17397.)
 2010-12-27 22:25:44 +00:00
Mark de Wever
93d2be1756 Remove unneeded includes. 2010-11-21 13:58:15 +00:00
Guillaume Melquiond
eeb047de55 Fixed file headers so that they match the content of the COPYING file. 2010-09-01 21:12:38 +00:00
Guillaume Melquiond
efbd8cc702 Fixed header dependencies. 2010-08-08 17:22:50 +00:00
Ali El Gariani
51ab72860e Replace all uses of 'colour' by 'color' in code. 2010-06-03 01:47:06 +00:00
Ali El Gariani
f6fab3788f Rename all SDL_Color font::FOO_COLOUR as font::FOO_COLOR 2010-06-02 22:14:44 +00:00
Ali El Gariani
d9997e472d Use only SDL_Color and stop using its synonym SDL_Colour 2010-06-02 22:14:32 +00:00
Alexander van Gessel
e483154df0 Make terrain_label store a t_string... 
...rather than an std::string, so language changes will cause the
labels to be retranslated
 2010-05-30 21:23:51 +01:00
Alexander van Gessel
d2af7f1d5d Add 'immutable' key to [label], defaulting to true (bug #16078) 2010-05-30 05:30:44 +01:00
Ali El Gariani
8eb001c684 Remove redundant scrolling functions for map labels 2010-05-18 15:52:33 +00:00
Fabian Müller
4a7e27d070 Reverted back to 42095. 2010-04-10 17:30:45 +00:00
Alexander van Gessel
183c40ba5b Merge fendrin_editor branch 2010-04-10 16:00:09 +01:00
Fabian Müller
22528f2290 Reverted 2010-02-23T19:14:44Z!joerg.hinrichs@alice-dsl.de and 2010-02-21T14:01:08Z!fabianmueller5@gmx.de. 2010-03-06 23:30:25 +00:00
Fabian Müller
d1245b9add Fixed wrong visibility for clear_map() 2010-02-21 15:13:08 +00:00
Fabian Müller
b988c2dcf3 Refactored the map_labels and related classes. 
The drawable class now inherits from the container class.

No change in game behaviour.
 2010-02-21 14:01:08 +00:00
Mark de Wever
92f5f92ce5 New year copyright update. 2010-01-01 13:16:49 +00:00
Guillaume Melquiond
53d9af1f8e Fixed constness in map_labels. 2009-10-05 19:38:53 +00:00
Guillaume Melquiond
fd16c7aac6 Removed unused field map_labels::label_cache_. 2009-10-05 19:38:50 +00:00
Mark de Wever
bbd40ee75e Pass parameter by const ref instead of const value. 
Issue found by cppcheck.
 2009-10-02 19:26:20 +00:00
Karol Nowak
7938300229 Implemented FR #14246 (visible_in_shroud= for [label]). 2009-09-06 23:55:30 +00:00
Guillaume Melquiond
52c5b10dc3 Removed unused constructor of terrain_label. 2009-08-16 10:08:19 +00:00
Guillaume Melquiond
8db72b20ab Removed unused constructor of map_labels. 2009-08-16 10:08:15 +00:00
Guillaume Melquiond
b181364752 Cleaned code a bit. 2009-07-19 16:30:17 +00:00
Guillaume Melquiond
a098e20435 Removed constant parameter from labels. 2009-07-18 12:06:40 +00:00
Guillaume Melquiond
dc608087c4 Fixed header dependencies. 2009-03-10 14:55:11 +00:00
Mark de Wever
a5d1d2e969 New year copyright update. 2009-01-01 10:27:41 +00:00
Christian Bielert
69542e7e31 bug #12635: fixed the reversed meaning of the fogged attribute... 
...of the item and label tags by renaming the attribute to "visible_in_fog"
 2008-12-20 23:26:14 +00:00
Tomasz Śniatowski
1589d8713c editor2 MDI feature - have more than one map open in the editor... 
...with fast switching between them. Can be disabled in the editor
settings. Also changed:

* the display class now holds a pointer to the map instead of a
  reference, a pointer can be changed which permits the entire MDI
  behavior. Related bits were also changed in terrain_builder.

* mouse_handler_base no longer holds a reference to the map

* the map labels class does not hold a gamemap reference, as it can
  use the display object to access the map. Also clearing all labels
  was exposed as a public member function.

* used scoped_ptrs and forward declarations to avoid having to include
  map_label.hpp and terrain_builder.hpp in display.hpp, this reduces
  build dependencies quite a bit.

* made get_action_state use the menu index to allow a dynamic menu to
  have checkboxes. This entire chunk of code needs a rewrite.
 2008-11-21 15:42:34 +01:00
Tomasz Śniatowski
01e504ede6 remove some map.hpp dependencies, 
...also separated viewpoint and map_exception classes from map.hpp
into separate headers (no cpp files)
 2008-10-17 17:53:08 +01:00
Tomasz Śniatowski
c54a538139 Refactor gamemap::location -- rename to map_location, 
...move into separate cpp/hpp pair. The code under src/ was modified
mainly using a global search-and-replace. This change allows reducing
code dependencies and gets rid of inner-class confusion (parts of the
code had to use "location" when referring to gamemap::location, it is
now consistent across the codebase.)
 2008-10-15 17:38:51 +01:00
Pauli Nieminen
190db928b9 Added support for labels and items that are hiden by fog... 
...(patch #1101 by broodkiller)
 2008-09-08 07:50:22 +00:00
Mark de Wever
d0c56111fa Remove the const of returned copies of strings. 2008-07-23 20:17:34 +00:00
Mark de Wever
001af46e6e Updated all headers to 2008. 2008-02-16 08:47:16 +00:00
Ali El Gariani
8bc1dde0e0 Simplify and clarify a little the map_label search function 
...because patch #849: "iterator for labels_ should be initialized to
something" indicated that the code was not nice, even if it was
correct.  The patch pointed highlighted the bad code style but don't
solved the problem.  Also add a function allowing to get public label
hidden under a team only-label Maybe use it in the not-team-only field
of the dialog for this rare case?
 2007-11-14 08:52:13 +00:00
Gunter Labes
ae9e10f260 codeclean run 
set svn:eol-style to native where missing
 2007-08-31 19:09:40 +00:00
Mark de Wever
080eb69f60 Updated the headers to state GPL 2+ and a few changelog cleanups. 2007-08-15 13:41:56 +00:00
Mark de Wever
bb01934b85 A rather large update which updates the copyright info 
* Wesnoth is distributed under the terms of the GPL version 2, made
  that more explicit

* updated the copyright range to 2007

* updated Dave's email adress
 2007-07-21 07:28:04 +00:00
Eric S. Raymond
f62da2becf Factor a dependency on game_state out of map_labels.cpp. 2007-07-04 11:03:23 +00:00
Eric S. Raymond
4439a0c763 Pry the map_label.cpp code the rest of the way loose from replay.cpp. 
If clearing of old labels during replays stops working, suspect this commit.
 2007-06-28 13:04:22 +00:00
Eric S. Raymond
00c2437836 Begin prying map_labels.cpp loose from the replay maChinery. 2007-06-28 12:24:38 +00:00
Eric S. Raymond
43e5de9fee Huge patch pretty much all name changes. 
display is now the base class and game_display the derived; code that
can use the base class because it doesn't need to grok units or teams
(like preferences.cpp and hotkeys.cpp) does so.
 2007-06-28 05:32:36 +00:00