mirror of
https://github.com/wesnoth/wesnoth
synced 2025-05-06 11:57:01 +00:00
quick hack to prevent template re-instatiation
This commit is contained in:
parent
1225da150c
commit
c3b4d21628
@ -14,6 +14,7 @@
|
||||
|
||||
#include "display.hpp"
|
||||
#include "global.hpp"
|
||||
#define UNIT_FRAME_H_PART2
|
||||
#include "unit_frame.hpp"
|
||||
|
||||
|
||||
@ -136,6 +137,9 @@ return data_.empty() ||
|
||||
template class progressive_<int>;
|
||||
template class progressive_<double>;
|
||||
|
||||
#undef UNIT_FRAME_H_PART2
|
||||
#include "unit_frame.hpp"
|
||||
|
||||
unit_frame::unit_frame() :
|
||||
image_(), image_diagonal_(),halo_(), sound_(),
|
||||
halo_x_(), halo_y_(), duration_(0),
|
||||
|
@ -48,6 +48,10 @@ public:
|
||||
typedef progressive_<int> progressive_int;
|
||||
typedef progressive_<double> progressive_double;
|
||||
|
||||
#endif
|
||||
#ifndef UNIT_FRAME_H_PART2
|
||||
#define UNIT_FRAME_H_PART2
|
||||
|
||||
//a class to describe a unit's animation sequence
|
||||
class unit_frame {
|
||||
public:
|
||||
|
Loading…
x
Reference in New Issue
Block a user