Skip to content

Commit f46f563

Browse files
committed
fixed recently moved file preventing compile (oops)
1 parent 94bf5c7 commit f46f563

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
lines changed

bin/profiles/default.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
"actor": "grampire",
44
"input": {
55
"binds": {
6-
"gamepad hat 0": "left",
7-
"gamepad hat 1": "right",
8-
"gamepad hat 2": "up",
9-
"gamepad hat 3": "down",
10-
"gamepad 0": [
6+
"left": "left",
7+
"right": "right",
8+
"up": "up",
9+
"down": "down",
10+
"z": [
1111
"shoot",
1212
"select"
1313
],
14-
"gamepad 12": "sprint",
15-
"gamepad 3": "strafe",
16-
"gamepad 1": "reload",
17-
"gamepad 4": [
14+
"left shift": "sprint",
15+
"x": "strafe",
16+
"v": "reload",
17+
"c": [
1818
"next_weapon",
1919
"back"
2020
],
21-
"gamepad 17": "previous_weapon",
22-
"gamepad 20": "action",
23-
"gamepad 21": "escape"
21+
"d": "previous_weapon",
22+
"a": "action",
23+
"escape": "escape"
2424
}
2525
}
2626
}

src/QorpseState.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "Qor/Sprite.h"
1515
#include "CharacterInterface.h"
1616
//#include "Qor/PlayerInterface3D.h"
17-
#include "Qor/TextScroller.h"
17+
#include "TextScroller.h"
1818
class BasicPartitioner;
1919
#include "HUD.h"
2020
#include "Character.h"

src/TextScroller.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "TextScroller.h"
2-
#include "GLTask.h"
32
using namespace std;
43
using namespace glm;
54

src/TextScroller.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33

44
//#include "IRealtime.h"
55
//#include "IRenderable.h"
6-
#include "Node.h"
7-
#include "Window.h"
8-
#include "Canvas.h"
9-
#include "Input.h"
6+
#include "Qor/Node.h"
7+
#include "Qor/Window.h"
8+
#include "Qor/Canvas.h"
9+
#include "Qor/Input.h"
1010
#include <queue>
1111
#include <boost/signals2.hpp>
12-
#include "kit/freq/animation.h"
13-
#include "Sound.h"
14-
#include "Sprite.h"
12+
#include "Qor/kit/freq/animation.h"
13+
#include "Qor/Sound.h"
14+
#include "Qor/Sprite.h"
1515

1616
class TextScroller:
1717
public Node

0 commit comments

Comments
 (0)