Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update packets to 2022-05-18 #3142

Merged
merged 50 commits into from
Jun 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
a4a07a5
Update shuffle packets and keys
4144 Apr 8, 2022
c6803e9
Update messages
4144 Apr 8, 2022
20d5710
Update packets table
4144 Apr 8, 2022
45ad999
Convert packet ZC_SAY_DIALOG into struct
4144 May 5, 2022
9418481
Add packet ZC_SAY_DIALOG2
4144 May 5, 2022
451dc49
Add script command mes2
4144 May 5, 2022
86daf55
Add script function mes2f
4144 May 5, 2022
e82f480
Convert packet ZC_WAIT_DIALOG into struct
4144 May 5, 2022
c9e1850
Add packet ZC_WAIT_DIALOG2
4144 May 5, 2022
86df546
Add script command next2
4144 May 6, 2022
d7fb73e
Add packet ZC_DIALOG_WINDOW_SIZE
4144 May 6, 2022
03374de
Add script command for set npc window dialog size
4144 May 6, 2022
ac3797f
Add packet ZC_DIALOG_WINDOW_POS
4144 May 6, 2022
f49304e
Add script command for set npc dialog window position
4144 May 6, 2022
3a9961e
Add packet ZC_DIALOG_WINDOW_POS_PERCENT
4144 May 6, 2022
b95af40
Add script function for move npc dialog window at given percent scree…
4144 May 6, 2022
87c3cd7
Convert PACKET_ZC_PLAY_NPC_BGM into struct
4144 May 9, 2022
f8a14e0
Update packet ZC_PLAY_NPC_BGM
4144 May 9, 2022
c9847e8
Update HPM
4144 May 9, 2022
7806a2c
Extend script command playbgm with type parameter
4144 May 9, 2022
ddbe5c6
Update packet ZC_MOVE_ITEM_FAILED
4144 May 11, 2022
0a0122e
Update HPM
4144 May 11, 2022
7ac4758
Convert packet CZ_MOVE_ITEM_FROM_BODY_TO_CART to struct
4144 May 11, 2022
c1653cf
Use item amount in packet ZC_MOVE_ITEM_FAILED
4144 May 11, 2022
dad6b68
Update HPM
4144 May 11, 2022
c63b0ac
Convert packet PACKET_ZC_SOUND into struct
4144 May 11, 2022
9e5e8f4
Add term parameter into functions clif_soundeffect, clif_soundeffectall
4144 May 11, 2022
cef7757
Update HPM
4144 May 11, 2022
2ef1788
Add term parameters into script command soundeffect
4144 May 11, 2022
9d5ec14
Use constants for play type in soundeffect and soundeffectall
4144 May 11, 2022
6870427
Fix play repeat sound in packet PACKET_ZC_SOUND
4144 May 11, 2022
7a82e56
Add soundeffect demo script
4144 May 11, 2022
9046a6e
Update positions for custom demo scripts
4144 May 11, 2022
f0c2f09
Update docs for soundeffect, soundeffectall, soundeffectall2
4144 May 11, 2022
d28c129
Add packet id for packet ZC_ACK_TOUSESKILL
4144 May 11, 2022
e73bc92
Update packet version in github ci
4144 May 11, 2022
2ddd816
Replace in most scripts PLAY_SOUND_REPEAT to PLAY_SOUND_ONCE
4144 May 11, 2022
e8f840d
Remove ifdef from setdialog functions
4144 May 11, 2022
4106b72
Update libbacktrace
4144 Apr 21, 2022
483f2d1
Add missing end line on nullpo callback error message
4144 Apr 21, 2022
2f7a3c9
Fix clang cast issues in libbacktrace
4144 May 11, 2022
a65f51c
Switch in github ci from clang-13 to clang-15
4144 May 11, 2022
e2b8c1a
Disable some clang-15 warnings
4144 May 11, 2022
0d8c233
Convert packet ZC_BROADCASTING_SPECIAL_ITEM_OBTAIN_item into struct
4144 May 18, 2022
b3c3b4f
Update HPM
4144 May 18, 2022
c97d812
Update packet ZC_BROADCASTING_SPECIAL_ITEM_OBTAIN_item
4144 May 18, 2022
cc9e5ae
Rename packet CZ_SEE_GUILD_MEMBERS into official name CZ_APPROXIMATE_…
4144 May 18, 2022
5f50f0f
Add refine field in clif->package_announce
4144 May 18, 2022
95be271
Update HPM
4144 May 18, 2022
012d719
Update GitHub Actions workflow controller
MishimaHaruna Jun 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: clang13_test
name: clang15_test

on: [workflow_call, pull_request]

Expand All @@ -14,12 +14,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
# clang-8, clang-9 removed for reduce number of jobs
CC: [clang-13]
CC: [clang-15]
RENEWAL: ["", "--disable-renewal"]
CLIENT_TYPE: ["", "--enable-packetver-re", "--enable-packetver-zero"]
SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
PACKET_VERSION: ["--enable-packetver=20211118", "--enable-packetver=20130724"]
PACKET_VERSION: ["--enable-packetver=20220518", "--enable-packetver=20130724"]
exclude:
- PACKET_VERSION: "--enable-packetver=20130724"
CLIENT_TYPE: "--enable-packetver-zero"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/controller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
needs: tools
if: ${{ !failure() && !cancelled() }}
uses: ./.github/workflows/build.yml
clang13_test:
clang15_test:
needs: build
if: ${{ !failure() && !cancelled() }}
uses: ./.github/workflows/clang13_test.yml
uses: ./.github/workflows/clang15_test.yml
gcc_test:
needs: build
if: ${{ !failure() && !cancelled() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gcc_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
RENEWAL: ["", "--disable-renewal"]
CLIENT_TYPE: ["", "--enable-packetver-re", "--enable-packetver-zero"]
SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
PACKET_VERSION: ["--enable-packetver=20211118", "--enable-packetver=20130724"]
PACKET_VERSION: ["--enable-packetver=20220518", "--enable-packetver=20130724"]
exclude:
- PACKET_VERSION: "--enable-packetver=20130724"
CLIENT_TYPE: "--enable-packetver-zero"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gccsnapshot_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
RENEWAL: ["", "--disable-renewal"]
CLIENT_TYPE: ["", "--enable-packetver-re", "--enable-packetver-zero"]
SANITIZER: ["--disable-manager", "--disable-manager --enable-sanitize=full"]
PACKET_VERSION: ["--enable-packetver=20211118", "--enable-packetver=20130724"]
PACKET_VERSION: ["--enable-packetver=20220518", "--enable-packetver=20130724"]
exclude:
- PACKET_VERSION: "--enable-packetver=20130724"
CLIENT_TYPE: "--enable-packetver-zero"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mariadb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
RENEWAL: [""]
CLIENT_TYPE: [""]
SANITIZER: ["--disable-manager", "--enable-sanitize=full"]
PACKET_VERSION: ["--enable-packetver=20211118"]
PACKET_VERSION: ["--enable-packetver=20220518"]
MYSQL: ["10.2", "latest"]
container:
image: debian:unstable
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
RENEWAL: [""]
CLIENT_TYPE: [""]
SANITIZER: ["--disable-manager", "--enable-sanitize=full"]
PACKET_VERSION: ["--enable-packetver=20211118"]
PACKET_VERSION: ["--enable-packetver=20220518"]
MYSQL: ["5.6", "5.7", "latest"]
container:
image: debian:unstable
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libbacktrace/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ Makefile: Makefile.in

%.o: %.c $(LIBBACKTRACE_H) Makefile
@echo " CC $<"
@$(CC) @CFLAGS@ @DEFS@ @CPPFLAGS@ -Wno-pointer-arith -Wno-switch-enum -c $(OUTPUT_OPTION) $<
@$(CC) @CFLAGS@ @DEFS@ @CPPFLAGS@ -Wno-pointer-arith -Wno-switch-enum -Wno-shadow -c $(OUTPUT_OPTION) $<
15 changes: 13 additions & 2 deletions 3rdparty/libbacktrace/alloc.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* alloc.c -- Memory allocation without mmap.
Copyright (C) 2012-2018 Free Software Foundation, Inc.
Copyright (C) 2012-2020 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.

Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -145,12 +145,23 @@ backtrace_vector_release (struct backtrace_state *state ATTRIBUTE_UNUSED,
backtrace_error_callback error_callback,
void *data)
{
vec->alc = 0;

if (vec->size == 0)
{
/* As of C17, realloc with size 0 is marked as an obsolescent feature, use
free instead. */
free (vec->base);
vec->base = NULL;
return 1;
}

vec->base = realloc (vec->base, vec->size);
if (vec->base == NULL)
{
error_callback (data, "realloc", errno);
return 0;
}
vec->alc = 0;

return 1;
}
2 changes: 1 addition & 1 deletion 3rdparty/libbacktrace/atomic.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* atomic.c -- Support for atomic functions if not present.
Copyright (C) 2013-2018 Free Software Foundation, Inc.
Copyright (C) 2013-2020 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.

Redistribution and use in source and binary forms, with or without
Expand Down
4 changes: 2 additions & 2 deletions 3rdparty/libbacktrace/backtrace.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* backtrace.c -- Entry point for stack backtrace library.
Copyright (C) 2012-2018 Free Software Foundation, Inc.
Copyright (C) 2012-2020 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.

Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -98,7 +98,7 @@ unwind (struct _Unwind_Context *context, void *vdata)

/* Get a stack backtrace. */

int
int __attribute__((noinline))
backtrace_full (struct backtrace_state *state, int skip,
backtrace_full_callback callback,
backtrace_error_callback error_callback, void *data)
Expand Down
10 changes: 8 additions & 2 deletions 3rdparty/libbacktrace/backtrace.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* backtrace.h -- Public header file for stack backtrace library.
Copyright (C) 2012-2018 Free Software Foundation, Inc.
Copyright (C) 2012-2020 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.

Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -75,7 +75,13 @@ typedef void (*backtrace_error_callback) (void *data, const char *msg,
use appropriate atomic operations. If THREADED is zero the state
may only be accessed by one thread at a time. This returns a state
pointer on success, NULL on error. If an error occurs, this will
call the ERROR_CALLBACK routine. */
call the ERROR_CALLBACK routine.

Calling this function allocates resources that cannot be freed.
There is no backtrace_free_state function. The state is used to
cache information that is expensive to recompute. Programs are
expected to call this function at most once and to save the return
value for all later calls to backtrace functions. */

extern struct backtrace_state *backtrace_create_state (
const char *filename, int threaded,
Expand Down
17 changes: 9 additions & 8 deletions 3rdparty/libbacktrace/btest.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* btest.c -- Test for libbacktrace library
Copyright (C) 2012-2018 Free Software Foundation, Inc.
Copyright (C) 2012-2020 Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.

Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -48,9 +48,9 @@ POSSIBILITY OF SUCH DAMAGE. */

/* Test the backtrace function with non-inlined functions. */

static int test1 (void) __attribute__ ((noinline, unused));
static int f2 (int) __attribute__ ((noinline));
static int f3 (int, int) __attribute__ ((noinline));
static int test1 (void) __attribute__ ((noinline, noclone, unused));
static int f2 (int) __attribute__ ((noinline, noclone));
static int f3 (int, int) __attribute__ ((noinline, noclone));

static int
test1 (void)
Expand Down Expand Up @@ -162,9 +162,9 @@ f13 (int f1line, int f2line)

/* Test the backtrace_simple function with non-inlined functions. */

static int test3 (void) __attribute__ ((noinline, unused));
static int f22 (int) __attribute__ ((noinline));
static int f23 (int, int) __attribute__ ((noinline));
static int test3 (void) __attribute__ ((noinline, noclone, unused));
static int f22 (int) __attribute__ ((noinline, noclone));
static int f23 (int, int) __attribute__ ((noinline, noclone));

static int
test3 (void)
Expand Down Expand Up @@ -423,7 +423,8 @@ test5 (void)
fprintf (stderr, "test5: NULL syminfo name\n");
symdata.failed = 1;
}
else if (strcmp (symdata.name, "global") != 0)
else if (!(strncmp (symdata.name, "global", 6) == 0
&& (symdata.name[6] == '\0'|| symdata.name[6] == '.')))
{
fprintf (stderr,
"test5: unexpected syminfo name got %s expected %s\n",
Expand Down
Loading