projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in comment in chat.cpp
[oweals/minetest.git]
/
src
/
game.h
diff --git
a/src/game.h
b/src/game.h
index 3c127539a52d5bf0a450d20b2e6dd9385a495c8e..1c831c530067527c3bda16135109ec2728eae465 100644
(file)
--- a/
src/game.h
+++ b/
src/game.h
@@
-1,6
+1,6
@@
/*
/*
-Minetest
-c55
-Copyright (C) 201
1
celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 201
3
celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
@@
-20,20
+20,21
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef GAME_HEADER
#define GAME_HEADER
#ifndef GAME_HEADER
#define GAME_HEADER
-#include "
common_irrlicht
.h"
+#include "
irrlichttypes_extrabloated
.h"
#include <string>
#include "keycode.h"
#include <string>
#include "keycode.h"
+#include <list>
-class KeyList : protected
core
::list<KeyPress>
+class KeyList : protected
std
::list<KeyPress>
{
{
- typedef
core
::list<KeyPress> super;
- typedef super::
Iterator I
terator;
- typedef super::
ConstIterator ConstI
terator;
+ typedef
std
::list<KeyPress> super;
+ typedef super::
iterator i
terator;
+ typedef super::
const_iterator const_i
terator;
- virtual
ConstI
terator find(const KeyPress &key) const
+ virtual
const_i
terator find(const KeyPress &key) const
{
{
-
ConstI
terator f(begin());
-
ConstI
terator e(end());
+
const_i
terator f(begin());
+
const_i
terator e(end());
while (f!=e) {
if (*f == key)
return f;
while (f!=e) {
if (*f == key)
return f;
@@
-42,10
+43,10
@@
class KeyList : protected core::list<KeyPress>
return e;
}
return e;
}
- virtual
I
terator find(const KeyPress &key)
+ virtual
i
terator find(const KeyPress &key)
{
{
-
I
terator f(begin());
-
I
terator e(end());
+
i
terator f(begin());
+
i
terator e(end());
while (f!=e) {
if (*f == key)
return f;
while (f!=e) {
if (*f == key)
return f;
@@
-65,14
+66,14
@@
public:
void unset(const KeyPress &key)
{
void unset(const KeyPress &key)
{
-
I
terator p(find(key));
+
i
terator p(find(key));
if (p != end())
erase(p);
}
void toggle(const KeyPress &key)
{
if (p != end())
erase(p);
}
void toggle(const KeyPress &key)
{
-
I
terator p(this->find(key));
+
i
terator p(this->find(key));
if (p != end())
erase(p);
else
if (p != end())
erase(p);
else
@@
-136,7
+137,6
@@
void the_game(
std::string address, // If "", local server is used
u16 port,
std::wstring &error_message,
std::string address, // If "", local server is used
u16 port,
std::wstring &error_message,
- std::string configpath,
ChatBackend &chat_backend,
const SubgameSpec &gamespec, // Used for local game
bool simple_singleplayer_mode
ChatBackend &chat_backend,
const SubgameSpec &gamespec, // Used for local game
bool simple_singleplayer_mode