0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use int types from stdint.h instead of SDL_Types.h

Browse source
This commit is contained in:
loonycyborg 2015-10-30 15:06:06 +03:00
parent 5c42f3d13b
commit 5d49489502
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/buffered_istream.hpp
View file

@ -22,6 +22,8 @@
#include "util.hpp"
#include <cstdio>
/**
* Helper class for buffering a @c std::istream.
*

15
src/game_config.hpp
View file

@ -20,10 +20,9 @@ class color_range;
#include "tstring.hpp"
#include <SDL_types.h>
#include <vector>
#include <map>
#include <stdint.h>
//basic game configuration information is here.
namespace game_config
@ -124,15 +123,15 @@ namespace game_config
extern double hex_semi_brightening;
extern std::string flag_rgb;
extern std::vector<Uint32> red_green_scale;
extern std::vector<Uint32> red_green_scale_text;
extern std::vector<uint32_t> red_green_scale;
extern std::vector<uint32_t> red_green_scale_text;
extern std::vector<std::string> foot_speed_prefix;
extern std::string foot_teleport_enter, foot_teleport_exit;
extern std::map<std::string, color_range> team_rgb_range;
extern std::map<std::string, t_string> team_rgb_name;
extern std::map<std::string, std::vector<Uint32> > team_rgb_colors;
extern std::map<std::string, std::vector<uint32_t> > team_rgb_colors;
/** observer team name used for observer team chat */
extern const std::string observer_team_name;
@ -160,7 +159,7 @@ namespace game_config
void load_config(const config &cfg);
void add_color_info(const config& v);
const std::vector<Uint32>& tc_info(const std::string& name);
const std::vector<uint32_t>& tc_info(const std::string& name);
const color_range& color_info(const std::string& name);
/**
@ -170,8 +169,8 @@ namespace game_config
* red_green_scale and red_green_scale_text
*/
Uint32 red_to_green(int val, bool for_text = true);
Uint32 blue_to_white(int val, bool for_text = true);
uint32_t red_to_green(int val, bool for_text = true);
uint32_t blue_to_white(int val, bool for_text = true);
extern const version_info wesnoth_version;
extern const version_info min_savegame_version;

4
src/terrain_translation.hpp
View file

@ -17,9 +17,9 @@
#ifndef TERRAIN_TRANSLATION_H_INCLUDED
#define TERRAIN_TRANSLATION_H_INCLUDED
#include <SDL_types.h> //used for Uint32 definition
#include <vector>
#include <map>
#include <stdint.h>
#include "exceptions.hpp"
@ -31,7 +31,7 @@ namespace t_translation {
*/
size_t max_map_size();
typedef Uint32 t_layer;
typedef uint32_t t_layer;
const t_layer WILDCARD = 0x2A000000;
const t_layer NO_LAYER = 0xFFFFFFFF;

3
src/util.hpp
View file

@ -502,8 +502,7 @@ inline bool contains(const Container & container, const Value & value)
#if 1
# include <SDL_types.h>
typedef Sint32 fixed_t;
typedef int32_t fixed_t;
# define fxp_shift 8
# define fxp_base (1 << fxp_shift)