From b0efde8bf754230d401889eee7cd788ff1e0c00c Mon Sep 17 00:00:00 2001 From: Arisotura Date: Tue, 22 Jan 2019 15:58:29 +0100 Subject: [PATCH] also, update copyright name --- melon.rc | 2 +- src/ARM.cpp | 2 +- src/ARM.h | 2 +- src/ARMInterpreter.cpp | 2 +- src/ARMInterpreter.h | 2 +- src/ARMInterpreter_ALU.cpp | 2 +- src/ARMInterpreter_ALU.h | 2 +- src/ARMInterpreter_Branch.cpp | 2 +- src/ARMInterpreter_Branch.h | 2 +- src/ARMInterpreter_LoadStore.cpp | 2 +- src/ARMInterpreter_LoadStore.h | 2 +- src/ARM_InstrTable.h | 2 +- src/CP15.cpp | 2 +- src/CRC32.cpp | 2 +- src/CRC32.h | 2 +- src/Config.cpp | 2 +- src/Config.h | 2 +- src/DMA.cpp | 2 +- src/DMA.h | 2 +- src/FIFO.h | 2 +- src/GPU.cpp | 2 +- src/GPU.h | 2 +- src/GPU2D.cpp | 2 +- src/GPU2D.h | 2 +- src/GPU3D.cpp | 2 +- src/GPU3D.h | 2 +- src/GPU3D_Soft.cpp | 2 +- src/NDS.cpp | 2 +- src/NDS.h | 2 +- src/NDSCart.cpp | 2 +- src/NDSCart.h | 2 +- src/Platform.h | 2 +- src/RTC.cpp | 2 +- src/RTC.h | 2 +- src/SPI.cpp | 2 +- src/SPI.h | 2 +- src/SPU.cpp | 2 +- src/SPU.h | 2 +- src/Savestate.cpp | 2 +- src/Savestate.h | 2 +- src/Wifi.cpp | 2 +- src/Wifi.h | 2 +- src/WifiAP.cpp | 2 +- src/WifiAP.h | 2 +- src/libui_sdl/DlgAudioSettings.cpp | 2 +- src/libui_sdl/DlgAudioSettings.h | 2 +- src/libui_sdl/DlgEmuSettings.cpp | 2 +- src/libui_sdl/DlgEmuSettings.h | 2 +- src/libui_sdl/DlgInputConfig.cpp | 4 ++-- src/libui_sdl/DlgInputConfig.h | 2 +- src/libui_sdl/Platform.cpp | 2 +- src/libui_sdl/libui/windows/areaevents.cpp | 2 +- src/libui_sdl/main.cpp | 2 +- src/melon_fopen.cpp | 2 +- src/melon_fopen.h | 2 +- src/types.h | 2 +- src/version.h | 2 +- 57 files changed, 58 insertions(+), 58 deletions(-) diff --git a/melon.rc b/melon.rc index 3b10024a..4a0f17e6 100644 --- a/melon.rc +++ b/melon.rc @@ -18,7 +18,7 @@ FILETYPE VFT_APP VALUE "FileVersion", "0.7.3" VALUE "FileDescription", "DS emulator, sorta. also 1st quality melon." VALUE "InternalName", "SDnolem" - VALUE "LegalCopyright", "2016-2019 StapleButter & co." + VALUE "LegalCopyright", "2016-2019 Arisotura & co." VALUE "LegalTrademarks", "" VALUE "OriginalFilename", "zafkflzdasd.exe" VALUE "ProductName", "melonDS" diff --git a/src/ARM.cpp b/src/ARM.cpp index b71df5c2..429c3412 100644 --- a/src/ARM.cpp +++ b/src/ARM.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/ARM.h b/src/ARM.h index 6d4442ff..c85b208f 100644 --- a/src/ARM.h +++ b/src/ARM.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/ARMInterpreter.cpp b/src/ARMInterpreter.cpp index 13127719..d3f66d82 100644 --- a/src/ARMInterpreter.cpp +++ b/src/ARMInterpreter.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/ARMInterpreter.h b/src/ARMInterpreter.h index 2982011c..1802bccd 100644 --- a/src/ARMInterpreter.h +++ b/src/ARMInterpreter.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/ARMInterpreter_ALU.cpp b/src/ARMInterpreter_ALU.cpp index 8120c6ae..f23d6b2e 100644 --- a/src/ARMInterpreter_ALU.cpp +++ b/src/ARMInterpreter_ALU.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/ARMInterpreter_ALU.h b/src/ARMInterpreter_ALU.h index 68c84f4f..0f7fe9ba 100644 --- a/src/ARMInterpreter_ALU.h +++ b/src/ARMInterpreter_ALU.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/ARMInterpreter_Branch.cpp b/src/ARMInterpreter_Branch.cpp index 5e2ef2c2..6d1cf174 100644 --- a/src/ARMInterpreter_Branch.cpp +++ b/src/ARMInterpreter_Branch.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/ARMInterpreter_Branch.h b/src/ARMInterpreter_Branch.h index aa5b995c..43347e30 100644 --- a/src/ARMInterpreter_Branch.h +++ b/src/ARMInterpreter_Branch.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/ARMInterpreter_LoadStore.cpp b/src/ARMInterpreter_LoadStore.cpp index be4084fb..1d1fc6d2 100644 --- a/src/ARMInterpreter_LoadStore.cpp +++ b/src/ARMInterpreter_LoadStore.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/ARMInterpreter_LoadStore.h b/src/ARMInterpreter_LoadStore.h index 58da5875..ab69b158 100644 --- a/src/ARMInterpreter_LoadStore.h +++ b/src/ARMInterpreter_LoadStore.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/ARM_InstrTable.h b/src/ARM_InstrTable.h index 4422e5c8..2e4a7072 100644 --- a/src/ARM_InstrTable.h +++ b/src/ARM_InstrTable.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/CP15.cpp b/src/CP15.cpp index 9f35e700..61a3ec4b 100644 --- a/src/CP15.cpp +++ b/src/CP15.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/CRC32.cpp b/src/CRC32.cpp index 62e334f7..5cb47e2e 100644 --- a/src/CRC32.cpp +++ b/src/CRC32.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/CRC32.h b/src/CRC32.h index 639a8a3f..449457ac 100644 --- a/src/CRC32.h +++ b/src/CRC32.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/Config.cpp b/src/Config.cpp index c423b5b2..9fd3eb8c 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/Config.h b/src/Config.h index 92ac77c1..68ef9d1c 100644 --- a/src/Config.h +++ b/src/Config.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/DMA.cpp b/src/DMA.cpp index 01ce04ec..51ce8255 100644 --- a/src/DMA.cpp +++ b/src/DMA.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/DMA.h b/src/DMA.h index c3bc38e4..3146ef19 100644 --- a/src/DMA.h +++ b/src/DMA.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/FIFO.h b/src/FIFO.h index 7ce67e9d..a9e9ed80 100644 --- a/src/FIFO.h +++ b/src/FIFO.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/GPU.cpp b/src/GPU.cpp index 91f47b46..14e562e8 100644 --- a/src/GPU.cpp +++ b/src/GPU.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/GPU.h b/src/GPU.h index 6f5733d2..50e5f553 100644 --- a/src/GPU.h +++ b/src/GPU.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/GPU2D.cpp b/src/GPU2D.cpp index f7730b9d..cdd61ea9 100644 --- a/src/GPU2D.cpp +++ b/src/GPU2D.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/GPU2D.h b/src/GPU2D.h index 76133f79..d7c4e3f0 100644 --- a/src/GPU2D.h +++ b/src/GPU2D.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp index 34f88dab..802c9cd6 100644 --- a/src/GPU3D.cpp +++ b/src/GPU3D.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/GPU3D.h b/src/GPU3D.h index ba3e19bf..279494af 100644 --- a/src/GPU3D.h +++ b/src/GPU3D.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/GPU3D_Soft.cpp b/src/GPU3D_Soft.cpp index fff59ad3..29b46e16 100644 --- a/src/GPU3D_Soft.cpp +++ b/src/GPU3D_Soft.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/NDS.cpp b/src/NDS.cpp index 48f4b38c..774c01c2 100644 --- a/src/NDS.cpp +++ b/src/NDS.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/NDS.h b/src/NDS.h index 31ac5511..32433374 100644 --- a/src/NDS.h +++ b/src/NDS.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/NDSCart.cpp b/src/NDSCart.cpp index 27fa9b52..a98f8c8e 100644 --- a/src/NDSCart.cpp +++ b/src/NDSCart.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2017 StapleButter + Copyright 2016-2017 Arisotura This file is part of melonDS. diff --git a/src/NDSCart.h b/src/NDSCart.h index ac8f8fed..0dc42204 100644 --- a/src/NDSCart.h +++ b/src/NDSCart.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/Platform.h b/src/Platform.h index 091e6074..2cff3f02 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/RTC.cpp b/src/RTC.cpp index cd35643f..83e5bdbe 100644 --- a/src/RTC.cpp +++ b/src/RTC.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/RTC.h b/src/RTC.h index ebfcda8c..7f904a69 100644 --- a/src/RTC.h +++ b/src/RTC.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/SPI.cpp b/src/SPI.cpp index 7c495557..5ed98902 100644 --- a/src/SPI.cpp +++ b/src/SPI.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/SPI.h b/src/SPI.h index 87ed63d5..9b987caa 100644 --- a/src/SPI.h +++ b/src/SPI.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/SPU.cpp b/src/SPU.cpp index 98620770..93fdb001 100644 --- a/src/SPU.cpp +++ b/src/SPU.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/SPU.h b/src/SPU.h index a7afbf7f..3cd5df34 100644 --- a/src/SPU.h +++ b/src/SPU.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/Savestate.cpp b/src/Savestate.cpp index e295f4ad..ee868477 100644 --- a/src/Savestate.cpp +++ b/src/Savestate.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/Savestate.h b/src/Savestate.h index bfc34b95..136b0cd0 100644 --- a/src/Savestate.h +++ b/src/Savestate.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/Wifi.cpp b/src/Wifi.cpp index 596c9f06..dbe836f7 100644 --- a/src/Wifi.cpp +++ b/src/Wifi.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/Wifi.h b/src/Wifi.h index 72517a1d..c97264b0 100644 --- a/src/Wifi.h +++ b/src/Wifi.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/WifiAP.cpp b/src/WifiAP.cpp index 3e8bdb0f..4d4ee193 100644 --- a/src/WifiAP.cpp +++ b/src/WifiAP.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/WifiAP.h b/src/WifiAP.h index 6f963c42..e62c0fb2 100644 --- a/src/WifiAP.h +++ b/src/WifiAP.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/libui_sdl/DlgAudioSettings.cpp b/src/libui_sdl/DlgAudioSettings.cpp index 41ce1775..5fe4ebcb 100644 --- a/src/libui_sdl/DlgAudioSettings.cpp +++ b/src/libui_sdl/DlgAudioSettings.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/libui_sdl/DlgAudioSettings.h b/src/libui_sdl/DlgAudioSettings.h index 23339678..30a5d538 100644 --- a/src/libui_sdl/DlgAudioSettings.h +++ b/src/libui_sdl/DlgAudioSettings.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/libui_sdl/DlgEmuSettings.cpp b/src/libui_sdl/DlgEmuSettings.cpp index 7caaa0cd..f9f8effe 100644 --- a/src/libui_sdl/DlgEmuSettings.cpp +++ b/src/libui_sdl/DlgEmuSettings.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/libui_sdl/DlgEmuSettings.h b/src/libui_sdl/DlgEmuSettings.h index f8da1481..126497a2 100644 --- a/src/libui_sdl/DlgEmuSettings.h +++ b/src/libui_sdl/DlgEmuSettings.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/libui_sdl/DlgInputConfig.cpp b/src/libui_sdl/DlgInputConfig.cpp index 7482817b..1869ec03 100644 --- a/src/libui_sdl/DlgInputConfig.cpp +++ b/src/libui_sdl/DlgInputConfig.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. @@ -169,7 +169,7 @@ void FinishJoyMapping(void* param) { InputDlgData* dlg = (InputDlgData*)param; int id = dlg->pollid & 0xFF; - + char keyname[16]; JoyMappingName(dlg->joymap[id], keyname); uiButtonSetText(dlg->pollbtn, keyname); diff --git a/src/libui_sdl/DlgInputConfig.h b/src/libui_sdl/DlgInputConfig.h index 2b0b6cb2..9a73f378 100644 --- a/src/libui_sdl/DlgInputConfig.h +++ b/src/libui_sdl/DlgInputConfig.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/libui_sdl/Platform.cpp b/src/libui_sdl/Platform.cpp index 733114e2..62fa659c 100644 --- a/src/libui_sdl/Platform.cpp +++ b/src/libui_sdl/Platform.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/libui_sdl/libui/windows/areaevents.cpp b/src/libui_sdl/libui/windows/areaevents.cpp index d65b11d3..3ff7a478 100644 --- a/src/libui_sdl/libui/windows/areaevents.cpp +++ b/src/libui_sdl/libui/windows/areaevents.cpp @@ -267,7 +267,7 @@ static int areaKeyEvent(uiArea *a, int up, WPARAM wParam, LPARAM lParam) ke.Up = up; ke.Repeat = (lParam & 0x40000000) ? 1:0; - // StapleButter note: I don't actually need all this key decoding + // Arisotura note: I don't actually need all this key decoding // raw scancodes are all I need for this #if 0 // the numeric keypad keys when Num Lock is off are considered left-hand keys as the separate navigation buttons were added later diff --git a/src/libui_sdl/main.cpp b/src/libui_sdl/main.cpp index 1c213153..6dd23d89 100644 --- a/src/libui_sdl/main.cpp +++ b/src/libui_sdl/main.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/melon_fopen.cpp b/src/melon_fopen.cpp index 007d248e..7f3e3e70 100644 --- a/src/melon_fopen.cpp +++ b/src/melon_fopen.cpp @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/melon_fopen.h b/src/melon_fopen.h index 40709e1e..9adde4fb 100644 --- a/src/melon_fopen.h +++ b/src/melon_fopen.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/types.h b/src/types.h index 1c4f140b..9b1edc9f 100644 --- a/src/types.h +++ b/src/types.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS. diff --git a/src/version.h b/src/version.h index 1db9ee49..82a3aa4a 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,5 @@ /* - Copyright 2016-2019 StapleButter + Copyright 2016-2019 Arisotura This file is part of melonDS.