upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-25 04:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert accidentally-committed code in c5ce248f54695316d4603c18b7e5e485b2564d24.

Browse Source
This commit is contained in:
Celtic Minstrel 2016-09-29 14:40:46 -04:00
parent 357047db78
commit a8aa38277e
4 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
host.lua
View File

@ -15,15 +15,10 @@ local function plugin()
local function idle_text(text)
counter = counter + 1
if counter % 100 == 0 then
if counter >= 100 then
counter = 0
log("idling " .. text)
end
if counter >= 100000 then
log("timed out " .. text)
context.exit{code = 1}
coroutine.yield()
end
end
log("hello world")

7
join.lua
View File

@ -34,15 +34,10 @@ local function plugin()
local function idle_text(text)
counter = counter + 1
if counter % 100 == 0 then
if counter >= 100 then
counter = 0
log("idling " .. text)
end
if counter >= 100000 then
log("timed out " .. text)
context.exit{code = 1}
coroutine.yield()
end
end
log("hello world")

11
src/events.cpp
View File

@ -461,7 +461,6 @@ void pump()
ev_end = events.end();
bool redrew = false;
for(ev_it = events.begin(); ev_it != ev_end; ++ev_it){
for (context& c : event_contexts)
{
@ -470,12 +469,6 @@ void pump()
SDL_Event &event = *ev_it;
switch(event.type) {
case DRAW_EVENT:
if(redrew) {
continue;
}
redrew = true;
break;
case SDL_WINDOWEVENT:
switch(event.window.event) {
@ -587,10 +580,6 @@ void pump()
}
}
if(event.type != DRAW_EVENT) {
redrew = false;
}
const handler_list& event_handlers = event_contexts.front().handlers;
for(auto handler : event_handlers) {
handler->handle_event(event);

3
src/playturn.cpp
View File

@ -92,8 +92,7 @@ turn_info::PROCESS_DATA_RESULT turn_info::handle_turn(const config& t)
{
//t can contain a [command] or a [upload_log]
assert(t.all_children_count() == 1);
/** @todo FIXME: Check what commands we execute when it's our turn!
*/
/** @todo FIXME: Check what commands we execute when it's our turn! */
//note, that this function might call itself recursively: do_replay -> ... -> get_user_choice -> ... -> playmp_controller::pull_remote_choice -> sync_network -> handle_turn
resources::recorder->add_config(t, replay::MARK_AS_SENT);