Skip to content

Commit 0acf6bf

Browse files
committed
observer
1 parent 8cf2839 commit 0acf6bf

File tree

8 files changed

+15
-13
lines changed

8 files changed

+15
-13
lines changed

c/uwapi/uwapi/modules/botsAdmin.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ extern "C"
2727
UNNATURAL_API void uwAdminForceSetColor(uint32 forceId, float r, float g, float b);
2828
UNNATURAL_API void uwAdminForceSetRace(uint32 forceId, uint32 raceProto);
2929
UNNATURAL_API void uwAdminSendSuggestedCameraFocus(uint32 position);
30+
UNNATURAL_API void uwAdminSetAutomaticSuggestedCameraFocus(bool enabled);
3031
UNNATURAL_API void uwAdminSendChat(const char *msg, UwChatTargetFlags flags, uint32 targetId);
3132

3233
#endif

c/uwapi/uwapi/modules/botsConnection.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ extern "C"
5656
// connect
5757

5858
UNNATURAL_API void uwSetConnectStartGui(bool enabled, const char *extraCmdParams);
59-
UNNATURAL_API void uwSetConnectAsObserver(bool observer);
6059
UNNATURAL_API bool uwConnectFindLan(uint64 timeoutMicroseconds);
6160
UNNATURAL_API void uwConnectDirect(const char *address, uint16 port);
6261
UNNATURAL_API void uwConnectLobbyId(uint64 lobbyId);

c/uwapi/uwapi/modules/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ extern "C"
3434
typedef uint64_t uint64;
3535
typedef int64_t sint64;
3636

37-
static const uint32 UW_VERSION = 34;
37+
static const uint32 UW_VERSION = 35;
3838
static const uint32 UW_GameTicksPerSecond = 20;
3939

4040
typedef struct UwIds

csharp/uwapi/admin.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ public static void SendSuggestedCameraFocus(uint position)
8989
Interop.uwAdminSendSuggestedCameraFocus(position);
9090
}
9191

92+
public static void SetAutomaticSuggestedCameraFocus(bool enabled)
93+
{
94+
Interop.uwAdminSetAutomaticSuggestedCameraFocus(enabled);
95+
}
96+
9297
public static void SendChat(string msg, ChatTargetFLags flags, uint id = uint.MaxValue)
9398
{
9499
Interop.uwAdminSendChat(msg, flags, id);

csharp/uwapi/game.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ public static void SetConnectStartGui(bool startGui, string extraParams = "--obs
6565
Interop.uwSetConnectStartGui(startGui, extraParams);
6666
}
6767

68-
public static void SetConnectAsObserver(bool observer)
69-
{
70-
Interop.uwSetConnectAsObserver(observer);
71-
}
72-
7368
public static bool ConnectFindLan(ulong timeoutMicroseconds = 1000000)
7469
{
7570
return Interop.uwConnectFindLan(timeoutMicroseconds);

csharp/uwapi/interop.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ public static class Interop
6868
[DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
6969
public static extern void uwAdminSendSuggestedCameraFocus(uint position);
7070

71+
[DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
72+
public static extern void uwAdminSetAutomaticSuggestedCameraFocus([MarshalAs(UnmanagedType.I1)] bool enabled);
73+
7174
[DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
7275
public static extern void uwAdminSendChat([MarshalAs(UnmanagedType.LPStr)] string msg, UwChatTargetFlags flags,
7376
uint targetId);
@@ -135,9 +138,6 @@ public enum UwConnectionStateEnum
135138
public static extern void uwSetConnectStartGui([MarshalAs(UnmanagedType.I1)] bool enabled,
136139
[MarshalAs(UnmanagedType.LPStr)] string extraCmdParams);
137140

138-
[DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
139-
public static extern void uwSetConnectAsObserver([MarshalAs(UnmanagedType.I1)] bool observer);
140-
141141
[DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
142142
[return:MarshalAs(UnmanagedType.I1)]
143143
public static extern bool uwConnectFindLan(ulong timeoutMicroseconds);
@@ -286,7 +286,7 @@ public static extern void uwCommandPlaceConstruction(uint constructionProto, uin
286286
[DllImport(LibName, CallingConvention = CallingConvention.Cdecl)]
287287
public static extern void uwCommandSelfDestruct(uint entityId);
288288

289-
public const uint UW_VERSION = 34;
289+
public const uint UW_VERSION = 35;
290290
public const uint UW_GameTicksPerSecond = 20;
291291
[StructLayout(LayoutKind.Sequential)]
292292
public struct UwIds

python/uwapi/uw/bots.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
typedef uint64_t uint64;
2222
typedef int64_t sint64;
2323

24-
static const uint32 UW_VERSION = 34;
24+
static const uint32 UW_VERSION = 35;
2525
static const uint32 UW_GameTicksPerSecond = 20;
2626

2727
typedef struct UwIds
@@ -96,6 +96,7 @@
9696
void uwAdminForceSetColor(uint32 forceId, float r, float g, float b);
9797
void uwAdminForceSetRace(uint32 forceId, uint32 raceProto);
9898
void uwAdminSendSuggestedCameraFocus(uint32 position);
99+
void uwAdminSetAutomaticSuggestedCameraFocus(bool enabled);
99100
void uwAdminSendChat(const char *msg, UwChatTargetFlags flags, uint32 targetId);
100101
void uwInitialize(uint32 version);
101102
void uwDeinitialize(void);
@@ -141,7 +142,6 @@
141142

142143

143144
void uwSetConnectStartGui(bool enabled, const char *extraCmdParams);
144-
void uwSetConnectAsObserver(bool observer);
145145
bool uwConnectFindLan(uint64 timeoutMicroseconds);
146146
void uwConnectDirect(const char *address, uint16 port);
147147
void uwConnectLobbyId(uint64 lobbyId);

sphinx/source/concepts/map.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ Tiles
77
-----
88
The map uses discrete tiles representation (similar to chess), as opposed to continuous space.
99

10+
Two neighboring tiles are typically 10 meters apart, however, different neighboring pairs will have different distances.
11+
1012
Tiles are indexed `0 .. N-1`.
1113

1214
Data available for each tile:

0 commit comments

Comments
 (0)