Commit graph

1774 commits

Author SHA1 Message Date
mattsc
1ae9757e65 Update Xcode project 2014-06-29 08:15:58 -07:00
Chris Beck
b4d6a254bf rename ambiguous "game_controller" to "game_launcher"
Minor change but helps to reduce the overuse / misuse of the term
"controller" in key class names in the project.
2014-06-29 09:52:46 -04:00
Chris Beck
da41bf9968 rename "main" compilation unit "wesnoth.cpp" to match executable 2014-06-29 09:39:40 -04:00
Chris Beck
f24f6adee1 add wmi pager class, to allow unlimited wml menu items
The pager is held by the play_controller and wraps around the
wmi_container, if there are too many items it adds "More Items"
or "Earlier Items" entries. These entries have special reserved
ids, if they are selected the pager traps them.

Future work might be to allow the page_size_ to be selected in
the preferences, that is currently left as a variable to make
it easy to support this.
2014-06-28 20:47:12 -04:00
Ignacio R. Morelle
fc834885e2 Resort CodeBlocks project file 2014-06-27 21:56:07 -04:00
Chris Beck
ed3453f742 move some utility files to utils folder 2014-06-27 19:06:18 -04:00
Chris Beck
d2edec5921 move notifications files to their own folder 2014-06-27 18:14:45 -04:00
Chris Beck
cb5a9a0d28 add display chat manager, notifications support outside game_display
The functionality of tracking observers and displaying chat messages
is moved to a manager class, which the gui owns.

The functionality of displaying notifications is similarly moved out
of the game_display and to a private namespace. (Static singleton
pattern seems okay here since there really won't need to be more
than one of these for a single application, it seems.)
2014-06-27 15:57:57 -04:00
mattsc
7e84df7f6c Update Xcode project 2014-06-25 05:49:59 -07:00
mattsc
d2699280b4 Update Xcode project 2014-06-25 05:33:48 -07:00
Chris Beck
30a443d12f move game_state to its own file 2014-06-24 15:36:58 -04:00
Chris Beck
b51d6a15d1 rename gamestatus.?pp -> game_data.?pp, b/c of content changes 2014-06-24 13:44:25 -04:00
Chris Beck
cf2651b5a7 rename drawable_unit.?pp -> unit_drawer.?pp, b/c of new contents 2014-06-24 13:22:13 -04:00
Chris Beck
663494f661 move teambuilder to its own file 2014-06-24 13:12:29 -04:00
Chris Beck
0f5876fe38 change fake_unit class to fake_unit_ptr
This is consistent with the introduction of the UnitPtr class.
fake_units really aren't different from units, the only difference
is their life time / allocation and ownership. Since we are trying
to use reference counting for all units (to make them safe to use
with animations), the fake units need to be managed by a reference
counted pointer also. This is the easiest way to achieve that.

I also remove some odd code the [move_units_fake] handler --
there was explicit code to remove the fake units from the fake
unit manager, but this is redundant as it is the responsibility
of the destructor.

Code Blocks and VC project files are updated, but
Code::Blocks Scons and Xcode are not.
2014-06-23 11:17:55 -04:00
Timotei Dolean
572ac8ea66 Merge pull request #214 from aquileia/VC_update
Update VC project
2014-06-21 14:59:39 +03:00
Ignacio R. Morelle
1554374c45 CodeBlocks project update 2014-06-20 22:15:26 -04:00
aquileia
28e12a73aa Update VC project 2014-06-21 03:39:41 +02:00
aquileia
9f92dacabb Fix VC project files 2014-06-20 01:51:21 +02:00
mattsc
4b10e1b9fb Update Xcode project 2014-06-18 15:32:41 -07:00
Chris Beck
a4b194c079 add recall list manager
This commit adds a dedicated recall list manager class.

The purpose of this is to

- Simplify the code that interacts with the recall list. Prior to
the commit most such code was based on iteration with explicit
iterators, and called global helper functions implemented in
unit.cpp to wrap the code that finds a unit in a vector. It turns
out that interacting with the recall list was the *only* use of
that code, so we make it a member function of the recall list
manager and take it out of unit.cpp.

Most of the code that touches the recall list was previously
7 or 8 lines with a for loop, now it tends to be 1 or 2 lines,
although further refactor may be possible.

- Improve encapsulation. This makes it possible to track how
other classes are interacting with the recall list, and may
make it easier to debug recall list problems by adding debugging
output to the class.
2014-06-18 12:54:32 -04:00
mattsc
9593d10050 Update Xcode project 2014-06-17 17:50:11 -07:00
Chris Beck
027a135118 Merge branch 'master' of git://github.com/wesnoth/wesnoth 2014-06-17 02:19:55 -04:00
Chris Beck
504e4932b5 split off animation fcs from unit to unit_animation_component
This is a strict refactor, all we do is move the functions and
variables used just for animations to "unit_animation_component",
and include the necessary headers appropriate.

With a bit more work we can probably remove the graphics related
headers from unit.hpp
2014-06-17 02:18:46 -04:00
mattsc
f78fbdb36a Update Xcode project 2014-06-16 20:21:07 -07:00
Chris Beck
0be1d731d5 add drawable unit class
drawable unit inherits from unit, and implements the draw function,
used only by the display. when the display wants to use the function,
it casts a unit pointer to a drawable_unit, and draws it. this
improves encapsulation.
2014-06-16 22:10:31 -04:00
Chris Beck
c8ada18ff4 update project files 2014-06-16 17:37:53 -04:00
Chris Beck
2510b779f6 rename animated.i to animated.tpp 2014-06-15 09:54:55 -04:00
mattsc
c837ee8d42 Update Xcode project 2014-06-14 15:56:58 -07:00
Chris Beck
a60d5b0018 move formula ai features of unit to a unit formula manager
This use of handle-body idiom saves *alot* of includes, since a
huge number of objects include unit indirectly, and make no use
of the ai formula features.
2014-06-14 18:39:57 -04:00
mattsc
4253b6b5fd Update Xcode project 2014-06-13 12:13:26 -07:00
Alexander van Gessel
07a6ba695e Merge pull request #199 from aquileia/ignore
Restructure and merge .gitignore files
2014-06-13 16:27:01 +02:00
Ignacio R. Morelle
f9936f12e4 Merge pull request #202 from aquileia/VC_update
Update VC project
2014-06-11 22:57:15 -04:00
Ignacio R. Morelle
acd814f64c CodeBlocks project update 2014-06-11 19:30:43 -04:00
aquileia
7e628340d0 Update VC project 2014-06-12 00:24:08 +02:00
Chris Beck
da552fc10e fixup segfaulting editor, favoring display_context over game_board
Currently, the editor does not generate game_board objects, and
leaves the pointer resources::gameboard null. This commit makes
map_location, reports, and tod_manager, three things used in
editor mode, use the display_context pointer instead of the
game_board pointer. We also move a function to display_context,
which finds a const unit * to a visible unit at a hex.
2014-06-11 01:28:15 -04:00
Chris Beck
522988c689 update projectfiles to include display_context.hpp 2014-06-10 18:45:44 -04:00
Chris Beck
ea26ebdd4a Merge pull request #198 from aquileia/VC_update
Windows WML Tests: Add total duration to output
2014-06-08 19:59:12 -04:00
aquileia
1e9a508795 gitignore: Merge rules from projectfiles/ 2014-06-09 01:00:41 +02:00
aquileia
32212f71dd Windows WML Tests: Add total duration to output 2014-06-07 23:02:06 +02:00
Ignacio R. Morelle
660719d52c Merge pull request #196 from sigurdfdragon/CodeBlocks_Update_20140607
CodeBlocks project update.
2014-06-07 16:08:11 -04:00
Ignacio R. Morelle
d21376f2be Merge pull request #197 from aquileia/VC_update
Update VC project
2014-06-07 16:08:02 -04:00
aquileia
f75cf3580d Update VC project for 294379a 2014-06-07 21:34:57 +02:00
aquileia
9d3dfb04a9 Update VC project for 7ca6ad8 2014-06-07 21:31:47 +02:00
sigurdfdragon
6996d05985 CodeBlocks project update.
Adjustments for 294379a157.
2014-06-07 15:23:08 -04:00
mattsc
5f524c2d58 Update Xcode project 2014-06-06 10:45:10 -07:00
Ignacio R. Morelle
c7d22b086f CodeBlocks project update 2014-06-03 20:11:45 -04:00
aquileia
cd4dcbff43 Windows WML tests: Keep account of executed tests
The final report now includes the number of
 - tests that were executed
 - tests thereof that failed
2014-06-02 21:24:56 +02:00
aquileia
be3a1fe1b1 Add missing source files to VC project
These files were added by 9687383d0 and 954e068a5
2014-06-02 21:24:35 +02:00
mattsc
ac04662e95 Update Xcode project 2014-06-01 17:25:14 -07:00