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

made it so mage of light lights up hexes around him

Browse source
This commit is contained in:
Dave White 2004-03-01 18:57:44 +00:00
parent 174a09db63
commit b9f68cd16c
3 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/schedules.cfg
View file

@ -74,6 +74,8 @@ blue=10
id=dusk
name=Dusk
image=Dusk.png
green=-15
blue=-15
[/illuminated_time]
#enddef
@ -91,6 +93,8 @@ blue=10
id=dusk
name=Dusk
image=Dusk.png
green=-15
blue=-15
[/illuminated_time]
#enddef
@ -105,5 +109,8 @@ lawful_bonus=-25
id=underground
name=Underground
image=Dusk.png
red=10
green=10
blue=10
[/illuminated_time]
#enddef

32
src/display.cpp
View file

@ -1229,9 +1229,9 @@ void display::draw_tile_adjacent(int x, int y, image::TYPE image_type, ADJACENT_
clip_rect_setter set_clip_rect(dst,clip_rect);
const std::vector<SDL_Surface*>& adj = getAdjacentTerrain(x,y,image_type,type);
const std::vector<shared_sdl_surface>& adj = getAdjacentTerrain(x,y,image_type,type);
for(std::vector<SDL_Surface*>::const_iterator i = adj.begin(); i != adj.end(); ++i) {
for(std::vector<shared_sdl_surface>::const_iterator i = adj.begin(); i != adj.end(); ++i) {
SDL_Rect dstrect = { xpos, ypos, 0, 0 };
SDL_BlitSurface(*i,NULL,dst,&dstrect);
}
@ -1452,9 +1452,9 @@ const std::string& get_direction(int n)
}
std::vector<SDL_Surface*> display::getAdjacentTerrain(int x, int y, image::TYPE image_type, ADJACENT_TERRAIN_TYPE terrain_type)
std::vector<shared_sdl_surface> display::getAdjacentTerrain(int x, int y, image::TYPE image_type, ADJACENT_TERRAIN_TYPE terrain_type)
{
std::vector<SDL_Surface*> res;
std::vector<shared_sdl_surface> res;
gamemap::location loc(x,y);
const gamemap::TERRAIN current_terrain = map_.get_terrain(loc);
@ -1507,12 +1507,12 @@ std::vector<SDL_Surface*> display::getAdjacentTerrain(int x, int y, image::TYPE
//find all the directions overlap occurs from
for(int i = (start+1)%6, n = 0; i != start && n != 6; ++n) {
if(tiles[i] == *terrain) {
SDL_Surface* surface = NULL;
shared_sdl_surface surface(NULL);
std::ostringstream stream;
for(int n = 0; *terrain == tiles[i] && n != 6; i = (i+1)%6, ++n) {
stream << get_direction(i);
const scoped_sdl_surface new_surface(getTerrain(
const shared_sdl_surface new_surface(getTerrain(
*terrain,image_type,x,y,stream.str()));
if(new_surface == NULL) {
@ -1544,9 +1544,12 @@ SDL_Surface* display::getTerrain(gamemap::TERRAIN terrain,image::TYPE image_type
map_.get_terrain_info(terrain).image(x,y) :
map_.get_terrain_info(terrain).adjacent_image());
const time_of_day& tod = status_.get_time_of_day();
const time_of_day& tod_at = timeofday_at(status_,units_,gamemap::location(x,y));
//see if there is a time-of-day specific version of this image
if(direction == "") {
const time_of_day& tod = status_.get_time_of_day();
const std::string tod_image = image + "-" + tod.id + ".png";
SDL_Surface* const im = image::get_image(tod_image,image_type);
@ -1563,6 +1566,21 @@ SDL_Surface* display::getTerrain(gamemap::TERRAIN terrain,image::TYPE image_type
map_.get_terrain_info(terrain).default_image() + ".png");
}
//see if this tile is illuminated to a different colour than it'd
//normally be displayed as
const int radj = tod_at.red - tod.red;
const int gadj = tod_at.green - tod.green;
const int badj = tod_at.blue - tod.blue;
if((radj|gadj|badj) != 0 && im != NULL) {
const scoped_sdl_surface backup(im);
std::cerr << "adjusting surface colour " << radj << "," << gadj << "," << badj << "\n";
im = adjust_surface_colour(im,radj,gadj,badj);
std::cerr << "done adjust...\n";
if(im == NULL)
std::cerr << "could not adjust surface..\n";
}
return im;
}

2
src/display.hpp
View file

@ -322,7 +322,7 @@ private:
void bounds_check_position();
std::vector<SDL_Surface*> getAdjacentTerrain(int x, int y, image::TYPE type, ADJACENT_TERRAIN_TYPE terrain_type);
std::vector<shared_sdl_surface> getAdjacentTerrain(int x, int y, image::TYPE type, ADJACENT_TERRAIN_TYPE terrain_type);
//this surface must be freed by the caller
SDL_Surface* getTerrain(gamemap::TERRAIN, image::TYPE type,