![[BACK]](/cvsweb/icons/back.gif){kind=icon}
Up to [local] / ports / games / devilutionx / patches
Up to [local] / ports / games / devilutionx / patches
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.10, Sat Sep 14 22:34:03 2019 UTC (5 years, 2 months ago) by namtsui
Branch: MAIN
CVS Tags: HEAD
Changes since 1.9: +0 -0 lines
FILE REMOVED
Summary: remove upstreamed diffs
Revision 1.9 / (download) - annotate - [select for diffs], Mon Sep 9 07:25:08 2019 UTC (5 years, 2 months ago) by namtsui
Branch: MAIN
Changes since 1.8: +1 -8 lines
Diff to previous 1.8 (colored)
Summary: use #pragma which is supported by all compilers
Revision 1.8 / (download) - annotate - [select for diffs], Sun Sep 8 23:40:19 2019 UTC (5 years, 2 months ago) by namtsui
Branch: MAIN
Changes since 1.7: +5 -26 lines
Diff to previous 1.7 (colored)
Summary: use new constant, TMEGAPKT_SIZE I tried to minimize usage of #ifdef __LP64__. Now down to one instance. Introduce a new TMEGAPKG_SIZE constant so that it works on i386 and amd64.
Revision 1.7 / (download) - annotate - [select for diffs], Tue Aug 27 05:54:05 2019 UTC (5 years, 2 months ago) by namtsui
Branch: MAIN
Changes since 1.6: +3 -3 lines
Diff to previous 1.6 (colored)
Summary: render code refactored and no longer needed
08:54 <brynet> nand1: clang diff got way smaller w/ devilutionX, as
they rewrote the render code.
08:55 <brynet> nand1: the huge chunk in Source/render.cpp can go
away.
08:56 <brynet> that makes things wayy easier.
08:57 <brynet> the rest of the patches are pretty trivial now.
Revision 1.6 / (download) - annotate - [select for diffs], Wed Jul 24 01:24:40 2019 UTC (5 years, 4 months ago) by namtsui
Branch: MAIN
Changes since 1.5: +5 -2 lines
Diff to previous 1.5 (colored)
Summary: __LP64__ for i386 and amd64 source: brynet
This hint comes from brynet. This should allow compilation on both i386 and amd64.
13:48 <brynet> [10:24:22] nand1: You could probably do #ifdef
__i386__ or __amd64__ or more generally, #ifdef
__LP64__
13:48 <brynet> [10:24:52] I suspect there may be a way to fix it so
the code works on both 32-bit and 64-bit platforms,
however.
Revision 1.5 / (download) - annotate - [select for diffs], Tue Jul 23 21:23:09 2019 UTC (5 years, 4 months ago) by namtsui
Branch: MAIN
Changes since 1.4: +2 -2 lines
Diff to previous 1.4 (colored)
Summary: update to july 24 git
multiplayer has segfault
Thread 2 received signal SIGSEGV, Segmentation fault.
[Switching to thread 240818]
0x0000042c664d1247 in dvl::multi_msg_countdown ()
at /usr/ports/pobj/devilutionx-0.4.0pl20190723/devilutionX-72f65d577124d24ab9f459ef164e31c9ab225b3e/Source/multi.cpp:209
209 /usr/ports/pobj/devilutionx-0.4.0pl20190723/devilutionX-72f65d577124d24ab9f459ef164e31c9ab225b3e/Source/multi.cpp: No such file or directory.
(gdb) bt
#0 0x0000042c664d1247 in dvl::multi_msg_countdown ()
at /usr/ports/pobj/devilutionx-0.4.0pl20190723/devilutionX-72f65d577124d24ab9f459ef164e31c9ab225b3e/Source/multi.cpp:209
#1 0x0000042c664d3bea in dvl::nthread_recv_turns (pfSendAsync=0x42ec7e700e0)
at /usr/ports/pobj/devilutionx-0.4.0pl20190723/devilutionX-72f65d577124d24ab9f459ef164e31c9ab225b3e/Source/nthread.cpp:103
#2 0x0000042c664d3f50 in dvl::nthread_handler ()
at /usr/ports/pobj/devilutionx-0.4.0pl20190723/devilutionX-72f65d577124d24ab9f459ef164e31c9ab225b3e/Source/nthread.cpp:186
#3 0x0000042c663ba935 in dvl::thread_translate (ptr=0x42f1507b350)
at /usr/ports/pobj/devilutionx-0.4.0pl20190723/devilutionX-72f65d577124d24ab9f459ef164e31c9ab225b3e/SourceX/miniwin/thread.cpp:24
#4 0x0000042f0bcea920 in SDL_RunThread () from /usr/local/lib/libSDL2.so.0.6
#5 0x0000042f0bd68117 in RunThread () from /usr/local/lib/libSDL2.so.0.6
#6 0x0000042e7545c381 in _rthread_start (v=<optimized out>)
at /usr/src/lib/librthread/rthread.c:96
#7 0x0000042eaea7b8c8 in __tfork_thread ()
at /usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:77
#8 0x0000000000000000 in ?? ()
Revision 1.4 / (download) - annotate - [select for diffs], Fri Jul 19 06:20:45 2019 UTC (5 years, 4 months ago) by namtsui
Branch: MAIN
Changes since 1.3: +10 -305 lines
Diff to previous 1.3 (colored)
Summary: updated comments
Revision 1.3 / (download) - annotate - [select for diffs], Fri Jul 19 05:27:35 2019 UTC (5 years, 4 months ago) by namtsui
Branch: MAIN
Changes since 1.2: +11 -0 lines
Diff to previous 1.2 (colored)
Summary: fix broken pointer arithmetic so amd64 multiplayer works
^ = 94 = FAKE_CMD_SETID
note the 4 bytes of garbage, likely due to padding
(gdb) print *packeta
$27 = {pNext = 0x0, dwSpaceLeft = 31505,
data = "\337\337\337\337^\000\002\000\000\350\001\000\000\000\000\000\000\000\000\377\000\000\000KDKDnam", '\000' <repeats 30 times>, "\036\n\024\031\001\000\000\000\000\000d\000\000\000\200\021\000\000\200\021\000\000\200\002\000\000\200\002", '\000' <repeats 53 times>, "\377\377", '\000' <repeats 17 times>, "\377\377", '\000' <repeats 17 times>, "\377\377", '\000' <repeats 17 times>, "\377\377"...}
supposed to be:
(gdb) print *sgpMegaPkt
$3 = {pNext = 0x0, dwSpaceLeft = 30717,
data = "^\000\002\000\000\350\001\000\000\000\000\000\000\000\000\377\000\000\000KDKDnam", '\000' <repeats 30 times>, "\036\n\024\031\001\000\000\000\000\000d\000\000\000\200\021\000\000\200\021\000\000\200\002\000\000\200\002", '\000' <repeats 53 times>, "\377\377", '\000' <repeats 17 times>, "\377\377", '\000' <repeats 17 times>, "\377\377", '\000' <repeats 17 times>, "\377\377", '\000' <repeats 11 times>...}
bad pointer arithmetic:
memcpy((char *)&packeta[1] - packeta->dwSpaceLeft, packet, dwSize);
Revision 1.2 / (download) - annotate - [select for diffs], Sun Jul 7 23:09:26 2019 UTC (5 years, 4 months ago) by namtsui
Branch: MAIN
Changes since 1.1: +18 -0 lines
Diff to previous 1.1 (colored)
Summary: TMegaPkt 64-bit pointer fix Seems to help with getting correct turn values
Revision 1.1 / (download) - annotate - [select for diffs], Sun Jul 7 10:07:58 2019 UTC (5 years, 4 months ago) by namtsui
Branch: MAIN
Summary: more debugging statements